fix runlevel-system

2025-07-24 11:16:51 +00:00 · 2009-03-18 20:39:21 +01:00 · 2009-03-18 20:39:21 +01:00 · abb023506c
commit abb023506c
parent 4fa0a53190
19 changed files with 40 additions and 19 deletions
--- a/packages/audio/alsa-utils/init.d/40_alsa
+++ b/packages/audio/alsa-utils/init.d/40_alsa
@ -2,7 +2,7 @@
 #
 # setup alsa (especially the mixer config)
 #
-# runlevels: geexbox, debug, configure
+# runlevels: openelec, debug, configure

 echo "### Setting up sound card ###"

--- a/packages/devel/dbus/init.d/15_dbus
+++ b/packages/devel/dbus/init.d/15_dbus
@ -2,7 +2,7 @@
 #
 # start D-BUS daemon
 #
-# runlevels: geexbox, debug, configure
+# runlevels: openelec, debug, configure

 if test -f /usr/bin/dbus-daemon; then
  echo "### Starting D-BUS ###"
--- a/packages/linux/init.d/01_date
+++ b/packages/linux/init.d/01_date
@ -2,6 +2,6 @@
 #
 # store boot time
 #
-# runlevels: geexbox, debug
+# runlevels: openelec, debug

 /bin/date > /tmp/bootdate
--- a/packages/linux/init.d/20_modules
+++ b/packages/linux/init.d/20_modules
@ -2,7 +2,7 @@
 #
 # load modules
 #
-# runlevels: geexbox, debug, install, configure
+# runlevels: openelec, debug, configure

 echo "### Loading kernel modules ###"

--- a/packages/network/avahi/init.d/43_avahi
+++ b/packages/network/avahi/init.d/43_avahi
@ -2,7 +2,7 @@
 #
 # start Avahi Daemon
 #
-# runlevels: geexbox, debug, configure
+# runlevels: openelec, debug, configure

 if test -f /usr/sbin/avahi-daemon; then

--- a/packages/network/bluez/init.d/22_bluetooth
+++ b/packages/network/bluez/init.d/22_bluetooth
@ -2,7 +2,7 @@
 #
 # setup bluetooth daemons
 #
-# runlevels: geexbox, debug
+# runlevels: openelec, debug

 echo "### Starting Bluetooth support ###"

--- a/packages/network/connman/init.d/42_connman
+++ b/packages/network/connman/init.d/42_connman
@ -2,7 +2,7 @@
 #
 # start Connection Manager
 #
-# runlevels: geexbox, debug, configure
+# runlevels: openelec, debug, configure

 if test -f /usr/sbin/connmand; then
  echo "### Starting Connection Manager ###"
--- a/packages/python/multimedia/elisa/init.d/71_elisa
+++ b/packages/python/multimedia/elisa/init.d/71_elisa
@ -2,7 +2,7 @@
 #
 # start elisa
 #
-# runlevels: geexbox, debug, configure
+# runlevels: openelec

 . /etc/sysconfig

--- a/packages/sysutils/automountd/init.d/21_automountd
+++ b/packages/sysutils/automountd/init.d/21_automountd
@ -2,7 +2,7 @@
 #
 # start D-BUS/HAL automounter daemon
 #
-# runlevels: geexbox, debug, configure
+# runlevels: openelec, debug, configure

 if test -f /usr/bin/automountd; then

--- a/packages/sysutils/busybox/init.d/13_syslogd
+++ b/packages/sysutils/busybox/init.d/13_syslogd
@ -2,7 +2,7 @@
 #
 # start cron daemon
 #
-# runlevels: geexbox, debug
+# runlevels: openelec, debug

 echo "### Starting Syslog daemon ###"

--- a/packages/sysutils/busybox/init.d/52_telnet
+++ b/packages/sysutils/busybox/init.d/52_telnet
@ -2,7 +2,7 @@
 #
 # start telnet daemon
 #
-# runlevels: geexbox, debug, configure
+# runlevels: openelec, debug, configure

 # get options
 test -f /etc/network || exit 1
--- a/packages/sysutils/busybox/init.d/53_httpd
+++ b/packages/sysutils/busybox/init.d/53_httpd
@ -2,7 +2,7 @@
 #
 # start http daemon
 #
-# runlevels: geexbox, debug, configure
+# runlevels: openelec, debug, configure

 # get options
 test -f /etc/network || exit 1
--- a/packages/sysutils/busybox/init.d/54_crond
+++ b/packages/sysutils/busybox/init.d/54_crond
@ -2,7 +2,7 @@
 #
 # start cron daemon
 #
-# runlevels: geexbox, debug
+# runlevels: openelec, debug

 echo "### Starting CRON daemon ###"

--- a/packages/sysutils/busybox/scripts/init.initramfs
+++ b/packages/sysutils/busybox/scripts/init.initramfs
@ -6,6 +6,18 @@
  BOOT=`/bin/busybox cat /proc/cmdline | /bin/busybox sed 's/.*boot=// ; s/ .*//'`
  DISK=`/bin/busybox cat /proc/cmdline | /bin/busybox sed 's/.*disk=// ; s/ .*//'`

+# parse command line arguments
+for arg in $(cat /proc/cmdline); do
+  case $arg in
+    debugging)
+      DEBUG=yes
+      ;;
+    configure)
+      CONFIGURE=yes
+      ;;
+  esac
+done
+
  /bin/busybox mdev -s

  /bin/busybox mount -t ext3 -o ro,noatime $BOOT /flash
@ -13,16 +25,25 @@

  if [ -f "/flash/openelec.system" ]; then
    /bin/busybox mount /flash/openelec.system /sysroot
+    INIT=/sbin/init.system
    if [ $? -ne 0 ] ; then
      echo Could not mount system on /sysroot. Starting debugging shell....
+      INIT=/sbin/nosystem
      /bin/busybox sh </dev/tty1 >/dev/tty1 2>&1
    fi
  fi

+RUNLEVEL="openelec"
+if test "$DEBUG" = yes; then
+  RUNLEVEL="debug"
+elif test "$CONFIGURE" = yes; then
+  RUNLEVEL="configure"
+fi
+
  /bin/busybox mount --bind /flash /sysroot/flash
  /bin/busybox mount --bind /storage /sysroot/storage

  /bin/busybox umount /proc
  /bin/busybox umount /sys

-  exec /bin/busybox switch_root /sysroot /sbin/init.system
+  exec /bin/busybox switch_root /sysroot $INIT $RUNLEVEL
--- a/packages/sysutils/hal/init.d/20_hal
+++ b/packages/sysutils/hal/init.d/20_hal
@ -2,7 +2,7 @@
 #
 # start HAL daemon
 #
-# runlevels: geexbox, debug, configure
+# runlevels: openelec, debug, configure

 if test -f /usr/sbin/hald; then

--- a/packages/sysutils/udev/init.d/01_udev
+++ b/packages/sysutils/udev/init.d/01_udev
@ -2,7 +2,7 @@
 #
 # start udev daemon
 #
-# runlevels: geexbox, debug, configure
+# runlevels: openelec, debug, configure

 . /etc/sysconfig

--- a/packages/virtual/Xorg/init.d/65_xorg
+++ b/packages/virtual/Xorg/init.d/65_xorg
@ -2,7 +2,7 @@
 #
 # configure X.Org video settings
 #
-# runlevels: geexbox
+# runlevels: openelec

 . /etc/sysconfig

--- a/packages/x11-toolkits/gtk+/init.d/64_gdk-query-pixbuf-loaders
+++ b/packages/x11-toolkits/gtk+/init.d/64_gdk-query-pixbuf-loaders
@ -2,7 +2,7 @@
 #
 # configure GDK Pixbuf Loaders
 #
-# runlevels: geexbox, debug, configure
+# runlevels: openelec, debug, configure

 . /etc/sysconfig

--- a/packages/x11-toolkits/pango/init.d/64_pango-querymodules
+++ b/packages/x11-toolkits/pango/init.d/64_pango-querymodules
@ -2,7 +2,7 @@
 #
 # configure Pango Modules
 #
-# runlevels: geexbox, debug, configure
+# runlevels: openelec, debug, configure

 . /etc/sysconfig