Fix minor bugs, update AUTHORS

Make sure snf-image-host passes the magic argument
in the kernel command line of the helper VM to activate snf-image-helper,
update AUTHORS.

diff --git a/snf-image-helper/AUTHORS b/snf-image-helper/AUTHORS
index 8acc940..4c647d8 100644 (file)
--- a/snf-image-helper/AUTHORS
+++ b/snf-image-helper/AUTHORS
@@ -1,2 +1,3 @@
 Nikos Skalkotos <skalkoto@grnet.gr>
 Constantinos Venetsanopoulos <cven@grnet.gr>
+Vangelis Koukis <vkoukis@grnet.gr>

diff --git a/snf-image-helper/snf-image-helper.in b/snf-image-helper/snf-image-helper.in
index 45571d7..4e6ea31 100644 (file)
--- a/snf-image-helper/snf-image-helper.in
+++ b/snf-image-helper/snf-image-helper.in
@@ -35,8 +35,8 @@ set -e
 set -o pipefail
 
 if [ "x$1" != "x--force" ]; then
-    log_error "WARNING: This will cause the system to halt."
-    log_error "Use --force if you know what you're doing."
+    echo "WARNING: Exiting, this command would cause the system to halt." >&2
+    echo "Use --force if you know what you're doing." >&2
     exit 1
 fi
 

diff --git a/snf-image-host/AUTHORS b/snf-image-host/AUTHORS
index 8acc940..4c647d8 100644 (file)
--- a/snf-image-host/AUTHORS
+++ b/snf-image-host/AUTHORS
@@ -1,2 +1,3 @@
 Nikos Skalkotos <skalkoto@grnet.gr>
 Constantinos Venetsanopoulos <cven@grnet.gr>
+Vangelis Koukis <vkoukis@grnet.gr>

diff --git a/snf-image-host/create b/snf-image-host/create
index 7cc1c0b..b9bbdb0 100755 (executable)
--- a/snf-image-host/create
+++ b/snf-image-host/create
@@ -108,7 +108,7 @@ add_cleanup rm "$snapshot"
     -boot c -serial stdio -serial file:"$result_file" \
     -fda "$floppy" -vga none -nographic -parallel none -monitor null \
     -kernel "$HELPER_KERNEL" -initrd "$HELPER_INITRD" \
-    -append "quiet ro root=/dev/sda1 console=ttyS0,9600n8" \
+    -append "quiet ro root=/dev/sda1 console=ttyS0,9600n8 snf_image_activate_helper" \
     2>&1 | sed 's|^|HELPER: |g'
 
 if [ $? -ne 0 ]; then