From 32562d4fa964979f0879f096451a8bbc20b9f7d9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 12 Sep 2011 19:29:16 +0200 Subject: [PATCH] Revert "busybox: rename $RUNLEVEL to $MODE" This reverts commit 991a990a2edec4fe0983518e3a9ccccd0e80f70d. --- packages/sysutils/busybox/profile.d/runlevel.conf | 8 ++++---- packages/sysutils/busybox/scripts/init | 4 ++-- packages/x11/xserver/xorg-server/scripts/xorg_start | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/sysutils/busybox/profile.d/runlevel.conf b/packages/sysutils/busybox/profile.d/runlevel.conf index 16d841da2e..2a65c191a3 100644 --- a/packages/sysutils/busybox/profile.d/runlevel.conf +++ b/packages/sysutils/busybox/profile.d/runlevel.conf @@ -24,14 +24,14 @@ ################################################################################ # getting runlevel - MODE="openelec" + RUNLEVEL="openelec" if test "$TEXTMODE" = yes; then - MODE="textmode" + RUNLEVEL="textmode" fi if test "$INSTALLER" = yes; then - MODE="installer" + RUNLEVEL="installer" fi -export MODE +export RUNLEVEL diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index f354d80b90..e81019243c 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -46,8 +46,8 @@ progress "Starting Init Scripts" RET=0 - for script in `ls -1 /etc/init.d/*`; do - if grep -q -e "^# runlevels:.*$MODE" $script; then + for script in /etc/init.d/*; do + if grep -q -e "^# runlevels:.*$RUNLEVEL" $script; then . $script S_RET=$? test $S_RET -ge $RET && RET=$S_RET diff --git a/packages/x11/xserver/xorg-server/scripts/xorg_start b/packages/x11/xserver/xorg-server/scripts/xorg_start index e31c9a5c9d..c971eec77c 100755 --- a/packages/x11/xserver/xorg-server/scripts/xorg_start +++ b/packages/x11/xserver/xorg-server/scripts/xorg_start @@ -22,7 +22,7 @@ . /etc/profile -if [ "$MODE" = openelec ]; then +if [ "$RUNLEVEL" = openelec ]; then logger -t Xorg "### starting Xorg with driver ${xorg_driver} ###"