Module Name: src
Committed By: jnemeth
Date: Mon Jun 25 07:22:46 UTC 2012
Modified Files:
src/etc: rc.shutdown
Log Message:
PR/46601 - Jim Bernard -- add support for rc_directories
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/etc/rc.shutdown
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.shutdown
diff -u src/etc/rc.shutdown:1.8 src/etc/rc.shutdown:1.9
--- src/etc/rc.shutdown:1.8 Sun May 19 01:01:33 2002
+++ src/etc/rc.shutdown Mon Jun 25 07:22:45 2012
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: rc.shutdown,v 1.8 2002/05/19 01:01:33 lukem Exp $
+# $NetBSD: rc.shutdown,v 1.9 2012/06/25 07:22:45 jnemeth Exp $
#
# rc.shutdown --
# Run the scripts in /etc/rc.d with reverse rcorder.
@@ -44,10 +44,12 @@ if [ -n "$rcshutdown_timeout" ]; then
fi
-# Determine the shutdown order of the /etc/rc.d scripts,
+# Determine the shutdown order of the rc.d scripts,
# and perform the operation
#
-files=$(rcorder -k shutdown ${rcshutdown_rcorder_flags} /etc/rc.d/*)
+scripts=$(for rcd in ${rc_directories:-/etc/rc.d}; do
+ test -d ${rcd} && echo ${rcd}/*; done)
+files=$(rcorder -k shutdown ${rcshutdown_rcorder_flags} ${scripts})
for _rc_elem in $(reverse_list $files); do
run_rc_script $_rc_elem stop
