aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2007-07-26 16:30:05 +0000
committerRoy Marples <roy@marples.name>2007-07-26 16:30:05 +0000
commitf678660f04a5e82358ee4d756bb3de141ccaedb1 (patch)
tree47602c019ffc4aa3e62e575042a3b64882c0c29e
parent075e80b358b3ea10c9a66caf6dd38c4ddc89f82c (diff)
Fix bootmisc stopping for pam_console and write halt record correctly.
-rwxr-xr-xinit.d/bootmisc6
1 files changed, 3 insertions, 3 deletions
diff --git a/init.d/bootmisc b/init.d/bootmisc
index f0508f59..96024eba 100755
--- a/init.d/bootmisc
+++ b/init.d/bootmisc
@@ -132,13 +132,13 @@ start() {
stop() {
# Reset pam_console permissions if we are actually using it
- if [ -x /sbin/pam_console_apply -a ! -c /dev/.devfsd ] && \
- [ -n $(grep -v -e '^[[:space:]]*#' /etc/pam.d/* | grep 'pam_console') ] ; then
+ if [ -x /sbin/pam_console_apply ] && ! [ -c /dev/.devfsd ] ; then
+ if grep -v -e '^[[:space:]]*#' /etc/pam.d/* | grep -q 'pam_console.so' ; then
/sbin/pam_console_apply -r
fi
# Write a halt record if we're shutting down
- case "${SOFTLEVEL}" in
+ case "${RC_SOFTLEVEL}" in
reboot|shutdown)
[ "${RC_UNAME}" = "Linux" ] && halt -w
;;