]> git.madduck.net Git - code/molly-guard.git/blobdiff - shutdown

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

factor out CHECKSDIR and move it to /etc
[code/molly-guard.git] / shutdown
index c68b57254297888114a1bea7792e480ae9890774..16683991304b399c03e8d15d0aec906fa0400d84 100755 (executable)
--- a/shutdown
+++ b/shutdown
@@ -5,11 +5,10 @@
 # Copyright © martin f. krafft <madduck@madduck.net>
 # Released under the terms of the Artistic Licence 2.0
 #
-# $Id: shutdown 299 2006-10-16 14:40:47Z madduck $
-#
 set -eu
 
 ME=molly-guard
+CHECKSDIR=/etc/molly-guard/checks.d
 
 CMD="${0##*/}"
 EXEC="/sbin/$CMD"
@@ -47,6 +46,18 @@ usage()
           terminal, and the actual command to execute is does not involve
            --help or is \`shutdown -c'.
 
+         $ME will always interpose the prompt if the environment variable
+          ALWAYS_MOLLY is set to '1'.  This variable may be set in the file
+         /etc/default/${ME} .
+
+        - Print out a warning message with information about this host
+         before the action takes place.  You can use:
+               /etc/molly-guard.<Action>.message
+         To print out a message specific to the command you're trying to
+         use.  Or:
+               /etc/molly-guard.message
+         For a general warning message.
+
        Only if the user satisfies all the checks will $ME take action.
        Specifying --molly-guard-do-nothing as argument to the command will
        make $ME echo the command it would execute rather than actually executing
@@ -95,7 +106,7 @@ case "$CMD $ARGS" in
     ;;
 esac
 
-run-parts --exit-on-error $CHECK_ARGS /usr/share/molly-guard/checks.d
+run-parts --exit-on-error --arg $CMD $CHECK_ARGS /etc/molly-guard/checks.d
 
 # run-parts won't return to us if there are failures, but I'm paranoid.
 if [ $? == 0 ]; then