Avoid activating snf-image-helper by mistake

Only activate the snf-image-helper automatically if the caller
has passed a magic argument in the kernel command line.

Require a '--force' argument to activate snf-image-helper,
to avoid accidental execution of the script.

diff --git a/snf-image-helper/snf-image-helper.in b/snf-image-helper/snf-image-helper.in
index 2966f84..45571d7 100644 (file)
--- a/snf-image-helper/snf-image-helper.in
+++ b/snf-image-helper/snf-image-helper.in
@@ -34,6 +34,12 @@
 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."
+    exit 1
+fi
+
 # terminate helper vm when the script exits
 add_cleanup telinit 0
 

diff --git a/snf-image-host/snf-image-update-helper.in b/snf-image-host/snf-image-update-helper.in
index 83b40be..2233719 100644 (file)
--- a/snf-image-host/snf-image-update-helper.in
+++ b/snf-image-host/snf-image-update-helper.in
@@ -7,7 +7,7 @@ set -o pipefail
 
 if [ ! -e "$HELPER_PKG" ]; then
     log_error "Helper package \`$HELPER_PKG' not found."
-    log_error "You need to provide this for the script to work"
+    log_error "You need to provide this for the script to work."
     exit 1
 fi
 
@@ -66,7 +66,7 @@ else
     echo "not found"
     echo "Debootstraping to create a new root filesystem:"
     debootstrap --arch amd64 --include "$HELPER_EXTRA_PKGS" \
-        --variant=minbase squeeze "$target" 2>&1 | sed -e 's/^/DEBOOTSTRAP: /g'
+        --variant=minbase stable "$target" 2>&1 | sed -e 's/^/DEBOOTSTRAP: /g'
 
     # remove the downloaded debs, as they are no longer needed
     find "$target/var/cache/apt/archives" -type f -name '*.deb' -print0 | \
@@ -131,7 +131,12 @@ cat > "$target/etc/rc.local" <<EOF
 #
 # By default this script does nothing.
 
-/usr/bin/snf-image-helper
+if ! grep -q snf_image_activate_helper /proc/cmdline; then
+    echo "WARNING: NOT calling snf-image-helper, add snf_image_activate_helper"
+    echo "to the kernel command line if you want to do so."
+else
+    /usr/bin/snf-image-helper --force
+fi
 
 exit 0
 EOF