diff --git a/packages/mediacenter/xbmc/init.d/93_xbmc b/packages/mediacenter/xbmc/init.d/93_xbmc index 99528740f7..4b95f893a6 100644 --- a/packages/mediacenter/xbmc/init.d/93_xbmc +++ b/packages/mediacenter/xbmc/init.d/93_xbmc @@ -68,13 +68,13 @@ case $RUNLEVEL in case "$RET" in 0) - poweroff -f + RUNLEVEL="poweroff" ;; 64) - poweroff -f + RUNLEVEL="poweroff" ;; 66) - reboot + RUNLEVEL="reboot" ;; 255) echo "Abnormal Exit. Exited with code $RET" diff --git a/packages/sysutils/ConsoleKit/scripts/ck-system-restart b/packages/sysutils/ConsoleKit/scripts/ck-system-restart index 003c352270..160e50fac4 100755 --- a/packages/sysutils/ConsoleKit/scripts/ck-system-restart +++ b/packages/sysutils/ConsoleKit/scripts/ck-system-restart @@ -20,4 +20,20 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -reboot +. /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 diff --git a/packages/sysutils/ConsoleKit/scripts/ck-system-stop b/packages/sysutils/ConsoleKit/scripts/ck-system-stop index a6e24e8385..29be405b0f 100755 --- a/packages/sysutils/ConsoleKit/scripts/ck-system-stop +++ b/packages/sysutils/ConsoleKit/scripts/ck-system-stop @@ -20,4 +20,20 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -poweroff +. /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 diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index 9c131e1521..7754bf3976 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -55,15 +55,3 @@ 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