Revert "ConsoleKit: add proper shutdown support via init scripts"

This reverts commit 626b77cf833c1cd6ef54c9c3a0fd8a813876067c.
This commit is contained in:
Stephan Raue 2011-09-12 19:21:32 +02:00
parent 4b15c9098a
commit 798d6af303
4 changed files with 17 additions and 37 deletions

View File

@ -68,13 +68,13 @@ case $RUNLEVEL in
case "$RET" in
0)
RUNLEVEL="poweroff"
poweroff -f
;;
64)
RUNLEVEL="poweroff"
poweroff -f
;;
66)
RUNLEVEL="reboot"
reboot
;;
255)
echo "Abnormal Exit. Exited with code $RET"

View File

@ -20,20 +20,4 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. /etc/profile
progress "Reboot the syste"
RET=0
RUNLEVEL="reboot"
for script in `ls -r1 /etc/init.d/*`; do
if grep -q -e "^# runlevels:.*$MODE" $script; then
. $script
S_RET=$?
test $S_RET -ge $RET && RET=$S_RET
fi
done
sync
reboot
reboot

View File

@ -20,20 +20,4 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. /etc/profile
progress "Poweroff the system"
RET=0
RUNLEVEL="poweroff"
for script in `ls -r1 /etc/init.d/*`; do
if grep -q -e "^# runlevels:.*$MODE" $script; then
. $script
S_RET=$?
test $S_RET -ge $RET && RET=$S_RET
fi
done
sync
poweroff -f
poweroff

View File

@ -55,3 +55,15 @@
test $S_RET -ge $RET && RET=$S_RET
fi
done
if [ -z "$RUNLEVEL" -o $RUNLEVEL="boot" ]; then
RUNLEVEL="poweroff"
fi
for script in `ls -r1 /etc/init.d/*`; do
if grep -q -e "^# runlevels:.*$MODE" $script; then
. $script
S_RET=$?
test $S_RET -ge $RET && RET=$S_RET
fi
done