From fa0ee03be1c748ffc3dd54ae18c0f34a66c975e0 Mon Sep 17 00:00:00 2001 From: Nikos Skalkotos Date: Wed, 26 Sep 2012 16:40:07 +0300 Subject: [PATCH] Add back the snf_image_activate_helper check --- snf-image-helper/snf-image-helper.in | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/snf-image-helper/snf-image-helper.in b/snf-image-helper/snf-image-helper.in index 9a1bc10..c4f99d4 100644 --- a/snf-image-helper/snf-image-helper.in +++ b/snf-image-helper/snf-image-helper.in @@ -33,8 +33,13 @@ fi set -e -# terminate helper vm when the script exits -add_cleanup system_poweroff +if grep snf_image_activate_helper /proc/cmdline > /dev/null; then + # terminate helper vm when the script exits + add_cleanup system_poweroff +else + log_error "Kernel command line activation flag: " \ + "\`snf_image_activate_helper' is missing" +fi if [ ! -b "$FLOPPY_DEV" ]; then log_error "Floppy device is not present!" -- 1.7.10.4