* Now also protects the poweroff command (closes: #401042).

[code/molly-guard.git] / shutdown

diff --git a/shutdown b/shutdown
index cb567c299405b772656b8249f7140168bab0c86c..8beaa50558358eb6e7a5e021399fde0ff8309a7c 100755 (executable)
--- a/shutdown
+++ b/shutdown
@@ -15,7 +15,7 @@ CMD="${0##*/}"
 EXEC="/sbin/$CMD"
 
 case "$CMD" in
 EXEC="/sbin/$CMD"
 
 case "$CMD" in

-  halt|reboot|shutdown)
+  halt|reboot|shutdown|poweroff)

     if [ ! -f $EXEC ]; then
       echo "E: $ME: not a regular file: $EXEC" >&2
       exit 4
     if [ ! -f $EXEC ]; then
       echo "E: $ME: not a regular file: $EXEC" >&2
       exit 4


@@ -38,9 +38,9 @@ do_real_cmd()
     (*--molly-guard-do-nothing*)
       ARGS0="${ARGS%%--molly-guard-do-nothing*}"
       ARGS1="${ARGS##*--molly-guard-do-nothing}"
     (*--molly-guard-do-nothing*)
       ARGS0="${ARGS%%--molly-guard-do-nothing*}"
       ARGS1="${ARGS##*--molly-guard-do-nothing}"

-      echo "$ME: would run: $EXEC $ARGS0 $ARGS1"
+      echo "$ME: would run: $EXEC ${ARGS0# } ${ARGS1# }"

       exit 0;;
       exit 0;;

-    *) exec $EXEC "$ARGS";;
+    *) eval exec $EXEC "$ARGS";;

   esac
 }
 
   esac
 }
 


@@ -51,7 +51,8 @@ test -t 0                    || do_real_cmd
 # pass through help commands
 case "$CMD $ARGS" in
   (shutdown\ *-c*) do_real_cmd;;
 # pass through help commands
 case "$CMD $ARGS" in
   (shutdown\ *-c*) do_real_cmd;;

-  (*-h*) do_real_cmd;;
+  (shutdown\ *-h*) do_real_cmd;;
+  (*--help*) do_real_cmd;;

   *) :;;
 esac
 
   *) :;;
 esac