factor out CHECKSDIR and move it to /etc

[code/molly-guard.git] / shutdown

diff --git a/shutdown b/shutdown
index 775a93ed6ffe0d205966dd27951886c7f85b965f..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
 #
 # 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
 set -eu
 
 ME=molly-guard

+CHECKSDIR=/etc/molly-guard/checks.d

 
 CMD="${0##*/}"
 EXEC="/sbin/$CMD"
 
 CMD="${0##*/}"
 EXEC="/sbin/$CMD"


@@ -51,6 +50,14 @@ usage()
           ALWAYS_MOLLY is set to '1'.  This variable may be set in the file
          /etc/default/${ME} .
 
           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
        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


@@ -99,7 +106,7 @@ case "$CMD $ARGS" in
     ;;
 esac
 
     ;;
 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
 
 # run-parts won't return to us if there are failures, but I'm paranoid.
 if [ $? == 0 ]; then