From 78187629c4c40c98c3d2e74edbbeac52a2cb7b17 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 12 Sep 2011 19:24:34 +0200 Subject: [PATCH] Revert "busybox: start init scripts on RUNLEVEL=boot" This reverts commit 5a491d0429d617ed602debcb5dff3d51d973f7f3. --- .../busybox/init.d/01_mount-filesystem | 10 +-- .../busybox/init.d/02_make-directorys | 67 ++++++++----------- .../sysutils/busybox/init.d/03_debugshell | 19 ++---- .../sysutils/busybox/init.d/04_systemconfig | 17 ++--- .../sysutils/busybox/init.d/04_userconfig | 39 +++++------ packages/sysutils/busybox/init.d/08_syslogd | 19 ++---- packages/sysutils/busybox/init.d/10_cdrom | 11 +-- packages/sysutils/busybox/init.d/99_shell | 23 +++---- 8 files changed, 75 insertions(+), 130 deletions(-) diff --git a/packages/sysutils/busybox/init.d/01_mount-filesystem b/packages/sysutils/busybox/init.d/01_mount-filesystem index 09d84f7fdc..5cf3c27d0b 100644 --- a/packages/sysutils/busybox/init.d/01_mount-filesystem +++ b/packages/sysutils/busybox/init.d/01_mount-filesystem @@ -23,11 +23,5 @@ # # runlevels: openelec, installer, textmode -case $RUNLEVEL in - boot) - progress "mounting needed filesystems" - mount -n -t ramfs none /var - ;; - poweroff|reboot) - ;; -esac +progress "mounting needed filesystems" + mount -n -t ramfs none /var diff --git a/packages/sysutils/busybox/init.d/02_make-directorys b/packages/sysutils/busybox/init.d/02_make-directorys index a2666de347..f52d5c4c69 100644 --- a/packages/sysutils/busybox/init.d/02_make-directorys +++ b/packages/sysutils/busybox/init.d/02_make-directorys @@ -23,47 +23,38 @@ # # runlevels: openelec, installer, textmode -case $RUNLEVEL in - boot) - progress "make variable directory structure" - mkdir -p /var/cache \ - /var/lock \ - /var/media \ - /var/run \ - /var/tmp \ - /var/run/sepermit \ - /var/run/lirc +progress "make variable directory structure" + mkdir -p /var/cache \ + /var/lock \ + /var/media \ + /var/run \ + /var/tmp \ + /var/run/sepermit \ + /var/run/lirc - chmod 1777 /var/run /var/tmp + chmod 1777 /var/run /var/tmp - touch /var/run/utmp - chmod 1777 /var/run/utmp + touch /var/run/utmp + chmod 1777 /var/run/utmp - if test "$DEBUG" = "yes"; then - mkdir -p $HOME/log - ln -sf $HOME/log /var/log - else - mkdir -p /var/log - fi + if test "$DEBUG" = "yes"; then + mkdir -p $HOME/log + ln -sf $HOME/log /var/log + else + mkdir -p /var/log + fi - touch /var/log/wtmp - chmod 1777 /var/log/wtmp - - # others: - mkdir -p /var/lib/polkit-1 - chmod 700 /var/lib/polkit-1 - mkdir -p /var/lib/polkit-1/localauthority/10-vendor.d - mkdir -p /var/lib/polkit-1/localauthority/20-org.d - mkdir -p /var/lib/polkit-1/localauthority/30-site.d - mkdir -p /var/lib/polkit-1/localauthority/50-local.d - mkdir -p /var/lib/polkit-1/localauthority/90-mandatory.d - - mkdir -p /var/lib/udisks - mkdir -p /var/lib/upower - ;; - - poweroff|reboot) - ;; -esac + touch /var/log/wtmp + chmod 1777 /var/log/wtmp +# others: + mkdir -p /var/lib/polkit-1 + chmod 700 /var/lib/polkit-1 + mkdir -p /var/lib/polkit-1/localauthority/10-vendor.d + mkdir -p /var/lib/polkit-1/localauthority/20-org.d + mkdir -p /var/lib/polkit-1/localauthority/30-site.d + mkdir -p /var/lib/polkit-1/localauthority/50-local.d + mkdir -p /var/lib/polkit-1/localauthority/90-mandatory.d + mkdir -p /var/lib/udisks + mkdir -p /var/lib/upower diff --git a/packages/sysutils/busybox/init.d/03_debugshell b/packages/sysutils/busybox/init.d/03_debugshell index d66a742f9a..94e5da62c6 100644 --- a/packages/sysutils/busybox/init.d/03_debugshell +++ b/packages/sysutils/busybox/init.d/03_debugshell @@ -25,18 +25,13 @@ TTY="3" if [ "$DEBUG" = "yes" ]; then - case $RUNLEVEL in - boot) - echo "###########################################" - echo "## it seems we are running in Debug mode ##" - echo "## starting debugging shell on console $TTY ##" - echo "## ...... switch with ctrl-alt-f$TTY ...... ##" - echo "###########################################" - openvt -w -c $TTY /bin/sh & - ;; + echo "###########################################" + echo "## it seems we are running in Debug mode ##" + echo "## starting debugging shell on console $TTY ##" + echo "## ...... switch with ctrl-alt-f$TTY ...... ##" + echo "###########################################" + + openvt -w -c $TTY /bin/sh & - poweroff|reboot) - ;; - esac fi diff --git a/packages/sysutils/busybox/init.d/04_systemconfig b/packages/sysutils/busybox/init.d/04_systemconfig index 7b8c90f0a2..7381f7bdcb 100644 --- a/packages/sysutils/busybox/init.d/04_systemconfig +++ b/packages/sysutils/busybox/init.d/04_systemconfig @@ -25,16 +25,9 @@ OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml" -case $RUNLEVEL in - boot) - if [ -f "$OPENELEC_SETTINGS" ]; then - progress "creating system settings" +if [ -f "$OPENELEC_SETTINGS" ]; then + progress "creating system settings" - mkdir -p /var/config - cat "$OPENELEC_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/settings.conf - fi - ;; - - poweroff|reboot) - ;; -esac + mkdir -p /var/config + cat "$OPENELEC_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/settings.conf +fi diff --git a/packages/sysutils/busybox/init.d/04_userconfig b/packages/sysutils/busybox/init.d/04_userconfig index 18743854fe..a9dc70dd55 100644 --- a/packages/sysutils/busybox/init.d/04_userconfig +++ b/packages/sysutils/busybox/init.d/04_userconfig @@ -23,30 +23,23 @@ # # runlevels: openelec, textmode -case $RUNLEVEL in - boot) - if [ -d /usr/config ]; then - progress "copy userconfig and samples" +if [ -d /usr/config ]; then + progress "copy userconfig and samples" - cd /usr/config - mkdir -p /storage/.config + cd /usr/config + mkdir -p /storage/.config - for dir in `find . -type d`; do - mkdir -p /storage/.config/$dir - done + for dir in `find . -type d`; do + mkdir -p /storage/.config/$dir + done - for config in `find . -type f -name "*.conf"`; do - if [ ! -f /storage/.config/$config ]; then - cp $config /storage/.config/$config - fi - done + for config in `find . -type f -name "*.conf"`; do + if [ ! -f /storage/.config/$config ]; then + cp $config /storage/.config/$config + fi + done - for sample in `find . -type f -name "*.sample"`; do - cp $sample /storage/.config/$sample - done - fi - ;; - - poweroff|reboot) - ;; -esac + for sample in `find . -type f -name "*.sample"`; do + cp $sample /storage/.config/$sample + done +fi diff --git a/packages/sysutils/busybox/init.d/08_syslogd b/packages/sysutils/busybox/init.d/08_syslogd index 0ea53573d4..2bb855a3e2 100644 --- a/packages/sysutils/busybox/init.d/08_syslogd +++ b/packages/sysutils/busybox/init.d/08_syslogd @@ -23,17 +23,10 @@ # # runlevels: openelec, installer, textmode -case $RUNLEVEL in - boot) - ( - progress "Starting Syslog daemon" - syslogd +( + progress "Starting Syslog daemon" + syslogd - progress "Starting Kernellog daemon" - klogd - )& - ;; - - poweroff|reboot) - ;; -esac + progress "Starting Kernellog daemon" + klogd +)& diff --git a/packages/sysutils/busybox/init.d/10_cdrom b/packages/sysutils/busybox/init.d/10_cdrom index e24ae1fcc9..545552bd24 100644 --- a/packages/sysutils/busybox/init.d/10_cdrom +++ b/packages/sysutils/busybox/init.d/10_cdrom @@ -23,12 +23,5 @@ # # runlevels: openelec, installer, textmode -case $RUNLEVEL in - boot) - progress "Setup some CDROM settings" - sysctl -w dev.cdrom.lock=0 > /dev/null 2>&1 & - ;; - - poweroff|reboot) - ;; -esac +progress "Setup some CDROM settings" + sysctl -w dev.cdrom.lock=0 > /dev/null 2>&1 & diff --git a/packages/sysutils/busybox/init.d/99_shell b/packages/sysutils/busybox/init.d/99_shell index 90be4cf5b8..111fe07e08 100644 --- a/packages/sysutils/busybox/init.d/99_shell +++ b/packages/sysutils/busybox/init.d/99_shell @@ -24,19 +24,12 @@ TTY="1" -case $RUNLEVEL in - boot) - echo "###########################################" - echo "## it seems we are running in Text mode. ##" - echo "## .... starting shell on console $TTY .... ##" - echo "## ...... switch with ctrl-alt-f$TTY ...... ##" - echo "###########################################" +echo "###########################################" +echo "## it seems we are running in Text mode. ##" +echo "## .... starting shell on console $TTY .... ##" +echo "## ...... switch with ctrl-alt-f$TTY ...... ##" +echo "###########################################" - while true; do - openvt -w -c $TTY /bin/sh - done - ;; - - poweroff|reboot) - ;; -esac +while true; do + openvt -w -c $TTY /bin/sh +done