Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next

Conflicts:
	packages/initramfs/sysutils/busybox-initramfs/scripts/init

packages/initramfs/sysutils/busybox-initramfs/scripts/init

@@ -172,8 +172,15 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
 
       [ ! -e /sysroot/sbin/init ] && /bin/busybox usleep 1000000
 
+<<<<<<< HEAD
       [ ${retry_nr} -gt 0 ]
     done
+=======
+  if [ -n "$disk" ]; then
+    mount_part "$disk" "/storage" "rw,noatime"
+    update "Kernel" "$IMAGE_KERNEL" "/flash/$IMAGE_KERNEL"
+    update "System" "$IMAGE_SYSTEM" "/flash/$IMAGE_SYSTEM"
+>>>>>>> 32562d4fa964979f0879f096451a8bbc20b9f7d9
 
     if [ ! -e /sysroot/sbin/init ]; then
       error "INIT_2" "Could not mount NBD root from $NBD_ROOT_SERVER port $NBD_ROOT_PORT"
@@ -236,6 +243,16 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
     mount_nbd
   fi
 
+<<<<<<< HEAD
+=======
+# move /flash and /storage to /sysroot
+  /bin/busybox mount --move /flash /sysroot/flash
+
+  if [ -n "$disk" ]; then
+    /bin/busybox mount --move /storage /sysroot/storage
+  fi
+
+>>>>>>> 32562d4fa964979f0879f096451a8bbc20b9f7d9
 # unmount all other filesystems
   /bin/busybox umount /dev
   /bin/busybox umount /proc

packages/linux/init.d/02_cpupower

@@ -23,12 +23,6 @@
 #
 # runlevels: openelec, textmode
 
-case $RUNLEVEL in
+progress "set cpu's to full power"
-  boot)
-    progress "set cpu's to full power"
-      cpupower frequency-set -g performance > /dev/null 2>&1
-    ;;
 
-  poweroff|reboot)
+  cpupower frequency-set -g performance > /dev/null 2>&1
-    ;;
-esac

packages/linux/init.d/15_modules

@@ -23,19 +23,13 @@
 #
 # runlevels: openelec, textmode
 
-case $RUNLEVEL in
+(
-  boot)
-    (
   progress "loading kernel modules"
 
   IFS='
-    '
+'
   for module in `cat /etc/modules|grep "^[^#]"`; do
     eval "modprobe $module" >/dev/null 2>&1
   done
-    )&
-    ;;
 
-  poweroff|reboot)
+)&
-    ;;
-esac

packages/mediacenter/xbmc/init.d/92_setup-xbmc

@@ -22,21 +22,19 @@
 #
 # runlevels: openelec
 
-case $RUNLEVEL in
+progress "setup XBMC"
-  boot)
-    progress "setup XBMC"
 
-    #
+#
-    # clean temp dir
+# clean temp dir
-    #
+#
   rm -rf $HOME/.xbmc/temp/*
 
-    #
+#
-    # add some default settings
+# add some default settings
-    #
+#
   mkdir -p $HOME/.xbmc/userdata
 
-    # use dds fanarts by default
+# use dds fanarts by default
   if [ ! -f $HOME/.xbmc/userdata/advancedsettings.xml ] ; then
     cat > $HOME/.xbmc/userdata/advancedsettings.xml << EOF
 <advancedsettings>
@@ -51,9 +49,9 @@ case $RUNLEVEL in
 EOF
   fi
 
-    #
+#
-    # setup directories for XBMC sources
+# setup directories for XBMC sources
-    #
+#
 
   [ ! -d "$HOME/music" ] && mkdir -p $HOME/music
   [ ! -d "$HOME/pictures" ] && mkdir -p $HOME/pictures
@@ -94,9 +92,9 @@ EOF
 EOF
   fi
 
-    #
+#
-    # common setup guisettings
+# common setup guisettings
-    #
+#
 
   mkdir -p $HOME/.xbmc/userdata
 
@@ -111,17 +109,17 @@ EOF
     </debug>
 EOF
 
-    #
+#
-    # include project specific options
+# include project specific options
-    #
+#
 
   if [ -f /usr/share/xbmc/config/guisettings.xml ]; then
     cat /usr/share/xbmc/config/guisettings.xml >> $HOME/.xbmc/userdata/guisettings.xml
   fi
 
-    #
+#
-    # common setup for amd and nvidia graphic
+# common setup for amd and nvidia graphic
-    #
+#
 
   # Always sync to vblank
     if [ "$GPUTYPE" = "NVIDIA" -o "$GPUTYPE" = "AMD" ] ; then
@@ -133,8 +131,3 @@ EOF
     fi
     echo "</settings>" >> $HOME/.xbmc/userdata/guisettings.xml
   fi
-    ;;
-
-  poweroff|reboot)
-    ;;
-esac

packages/mediacenter/xbmc/init.d/93_xbmc

@@ -22,23 +22,21 @@
 #
 # runlevels: openelec
 
-case $RUNLEVEL in
+LIRCDEV="/var/run/lirc/lircd"
-  boot)
+[ -e /var/run/lirc/lircd.irtrans ] && LIRCDEV="/var/run/lirc/lircd.irtrans"
-    LIRCDEV="/var/run/lirc/lircd"
+XBMC_ARGS="--standalone -fs --lircdev $LIRCDEV"
-    [ -e /var/run/lirc/lircd.irtrans ] && LIRCDEV="/var/run/lirc/lircd.irtrans"
-    XBMC_ARGS="--standalone -fs --lircdev $LIRCDEV"
 
-    progress "starting XBMC"
+progress "starting XBMC"
 
-    # hack for Boxee Remote
+# hack for Boxee Remote
-    if $(cat /proc/bus/input/devices | grep Vendor=0471 | grep -q Product=20d9);then
+if $(cat /proc/bus/input/devices | grep Vendor=0471 | grep -q Product=20d9);then
   export SDL_MOUSE_RELATIVE=0
-    fi
+fi
 
-    # hack: make addon-bins executable
+# hack: make addon-bins executable
   chmod +x /storage/.xbmc/addons/*/bin/* > /dev/null 2>&1
 
-    # starting autostart script (will be removed later again, dont use it!!!)
+# starting autostart script (will be removed later again, dont use it!!!)
   AUTOSTART="/storage/.config/autostart.sh"
   if [ -f $AUTOSTART ]; then
     echo "!!! AUTOSTART script detected !!!" >> /var/log/messages
@@ -48,19 +46,19 @@ case $RUNLEVEL in
     sh $AUTOSTART
   fi
 
-    # starting autoupdate
+# starting autoupdate
   [ -f /usr/bin/autoupdate ] && /usr/bin/autoupdate &
 
-    # waiting for Xorg to start
+# waiting for Xorg to start
   wait_for_xorg
 
-    # set cpu's to 'on demand'
+# set cpu's to 'on demand'
   ( usleep 15000000
     progress "set cpu's to 'on demand'"
     cpupower frequency-set -g ondemand > /dev/null 2>&1
   )&
 
-    # starting XBMC
+# starting XBMC
   while true; do
 
     DISPLAY=:0.0 /usr/lib/xbmc/xbmc.bin $XBMC_ARGS > /dev/null 2>&1
@@ -68,13 +66,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"
@@ -87,8 +85,3 @@ case $RUNLEVEL in
 
     usleep 250000
   done
-    ;;
-
-  poweroff|reboot)
-    ;;
-esac

packages/network/avahi/init.d/53_avahi

@@ -22,19 +22,11 @@
 #
 # runlevels: openelec, textmode
 
-case $RUNLEVEL in
+(
-  boot)
-    (
   wait_for_network
 
   progress "Starting Avahi Daemon"
+
     mkdir -p /var/run/avahi-daemon
     avahi-daemon -D
-    )&
+)&
-    ;;
-
-  poweroff|reboot)
-    progress "Starting Avahi Daemon"
-      killall avahi-daemon
-    ;;
-esac

packages/network/connman/init.d/21_network

@@ -22,30 +22,28 @@
 #
 # runlevels: openelec, installer, textmode
 
-case $RUNLEVEL in
+if [ -f /var/config/settings.conf ]; then
-  boot)
-    if [ -f /var/config/settings.conf ]; then
   . /var/config/settings.conf
 
-    # save original interface names (eth0, eth1)
+# save original interface names (eth0, eth1)
   NET_IFACE_NAME=$NET_IFACE
   NET2_IFACE_NAME=$NET2_IFACE
-    fi
+fi
 
-    [ -z "$NET_HOSTNAME" ] && NET_HOSTNAME="openelec"
+[ -z "$NET_HOSTNAME" ] && NET_HOSTNAME="openelec"
 
-    # setup hostname
+# setup hostname
   progress "Setup hostname"
   echo "$NET_HOSTNAME" > /proc/sys/kernel/hostname
 
-    # create /etc/hosts file, useful for gethostbyname(localhost)
+# create /etc/hosts file, useful for gethostbyname(localhost)
   progress "creating /etc/hosts"
   echo -e "127.0.0.1\tlocalhost $NET_HOSTNAME" > /etc/hosts
 
-    # add user defined hosts.conf entry's
+# add user defined hosts.conf entry's
   [ -f $HOME/.config/hosts.conf ] && cat $HOME/.config/hosts.conf >> /etc/hosts
 
-    (
+(
   # setup Networking 1
     progress "setup Networking 1"
 
@@ -170,7 +168,7 @@ case $RUNLEVEL in
       [ -n "$NET2_DNS3" ] && NET2_NAMESERVER="$NET2_NAMESERVER;$NET2_DNS3"
       [ -n "$NET2_NAMESERVER" ] && echo "Nameservers=$NET2_NAMESERVER;" >> $CONNMAN_PROFILE
 
-    (
+(
     # wait some time, put eth1 (NET2_IFACE) down and then up
     # this is just temporary solution until I figure out how to
     # do properly with connman
@@ -178,7 +176,7 @@ case $RUNLEVEL in
       ifconfig $NET2_IFACE_NAME down
       usleep 1000000
       ifconfig $NET2_IFACE_NAME up
-    )&
+)&
 
   fi
   # END OF NETWORK 2
@@ -195,9 +193,4 @@ case $RUNLEVEL in
       /usr/sbin/connmand -n > /dev/null 2>&1
       usleep 250000
     done
-    )&
+)&
-    ;;
-
-  poweroff|reboot)
-    ;;
-esac

packages/network/netmount/init.d/59_netmount

@@ -22,16 +22,9 @@
 #
 # runlevels: openelec, textmode
 
-case $RUNLEVEL in
+(
-  boot)
-    (
   wait_for_network
 
   progress "mounting Network shares"
     netmount > /dev/null 2>&1
-    )&
+)&
-    ;;
-
-  poweroff|reboot)
-    ;;
-esac

packages/network/openssh/init.d/51_sshd

@@ -22,6 +22,7 @@
 #
 # runlevels: openelec, textmode
 
+(
   RSA1_KEY="/storage/.cache/ssh/ssh_host_key"
   RSA2_KEY="/storage/.cache/ssh/ssh_host_rsa_key"
   DSA2_KEY="/storage/.cache/ssh/ssh_host_dsa_key"
@@ -29,9 +30,6 @@
   KEYGEN="/usr/bin/ssh-keygen"
   SSHD="/usr/sbin/sshd"
 
-case $RUNLEVEL in
-  boot)
-    (
   # Check for the SSH1 RSA key
     if [ ! -f $RSA1_KEY ] ; then
       progress "SSH: generating SSH1 RSA key"
@@ -74,11 +72,5 @@ case $RUNLEVEL in
     mkdir -p /var/empty
     chmod -R 600 /var/empty
     $SSHD
-    )&
-    ;;
 
-  poweroff|reboot)
+)&
-    progress "Stopping SSH Server"
-      killall sshd
-    ;;
-esac

packages/network/samba/scripts/52_samba

@@ -22,12 +22,7 @@
 #
 # runlevels: openelec, textmode
 
-SMB_USERCONF="/storage/.config/samba.conf"
+(
-SMB_DEFCONF="/etc/samba/smb.conf"
-
-case $RUNLEVEL in
-  boot)
-    (
   if [ -f /var/config/settings.conf ]; then
     . /var/config/settings.conf
 
@@ -37,6 +32,9 @@ case $RUNLEVEL in
 
       progress  "Starting Samba server"
 
+      SMB_USERCONF="/storage/.config/samba.conf"
+      SMB_DEFCONF="/etc/samba/smb.conf"
+
       if [ -f $SMB_USERCONF ]; then
         SMB_ARG="--configfile=$SMB_USERCONF"
       else
@@ -48,12 +46,4 @@ case $RUNLEVEL in
       nmbd --daemon $SMB_ARG > /dev/null 2>&1
     fi
   fi
-    )&
+)&
-    ;;
-
-  poweroff|reboot)
-    progress  "Stopping Samba server"
-      killall nmbd
-      killall smbd
-    ;;
-esac

packages/sysutils/ConsoleKit/init.d/34_ConsoleKit

@@ -22,14 +22,8 @@
 #
 # runlevels: openelec, textmode
 
-case $RUNLEVEL in
+progress "starting ConsoleKit daemon"
-  boot)
-    progress "starting ConsoleKit daemon"
 
   install -m 755 -d /var/log/ConsoleKit
   install -m 755 -d /var/run/ConsoleKit
-    ;;
 
-  poweroff|reboot)
-    ;;
-esac

packages/sysutils/ConsoleKit/scripts/ck-system-restart

@@ -20,20 +20,4 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-. /etc/profile
+reboot
-
-  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

packages/sysutils/ConsoleKit/scripts/ck-system-stop

@@ -20,20 +20,4 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-. /etc/profile
+poweroff
-
-  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

packages/sysutils/busybox/init.d/01_mount-filesystem

@@ -23,31 +23,5 @@
 #
 # runlevels: openelec, installer, textmode
 
-case $RUNLEVEL in
+progress "mounting needed filesystems"
-  boot)
-    progress "mounting needed filesystems"
-      mount -n -t devtmpfs none /dev
-      mkdir -p /dev/pts
-        mount -n -t devpts -o gid=5,mode=620 none /dev/pts
-      mkdir -p /dev/shm
-        mount -n -t tmpfs none /dev/shm
-      mount -n -t tmpfs none /run
   mount -n -t ramfs none /var
-      mount "$disk" /storage -o rw,noatime > /dev/null 2>&1
-    ;;
-
-  poweroff|reboot)
-    progress "unmounting filesystems"
-      for i in 1 2 3 4 5 6 7 8 9 10; do
-        echo "umount /storage"
-        ERR_ENV=1
-        umount /storage
-        [ "$?" -eq "0" ] && ERR_ENV=0 && break
-        usleep 1000000
-      done
-      if [ "$ERR_ENV" -ne "0" ]; then
-        mount -o remount,ro /storage
-        umount -l /storage
-      fi
-    ;;
-esac

packages/sysutils/busybox/init.d/02_make-directorys

@@ -23,9 +23,7 @@
 #
 # runlevels: openelec, installer, textmode
 
-case $RUNLEVEL in
+progress "make variable directory structure"
-  boot)
-    progress "make variable directory structure"
   mkdir -p /var/cache \
            /var/lock \
            /var/media \
@@ -49,7 +47,7 @@ case $RUNLEVEL in
   touch /var/log/wtmp
     chmod 1777 /var/log/wtmp
 
-    # others:
+# others:
   mkdir -p /var/lib/polkit-1
     chmod 700 /var/lib/polkit-1
   mkdir -p /var/lib/polkit-1/localauthority/10-vendor.d
@@ -60,10 +58,3 @@ case $RUNLEVEL in
 
   mkdir -p /var/lib/udisks
   mkdir -p /var/lib/upower
-    ;;
-
-  poweroff|reboot)
-    ;;
-esac
-
-

packages/sysutils/busybox/init.d/03_debugshell

@@ -25,8 +25,7 @@
 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 ##"
@@ -34,9 +33,5 @@ if [ "$DEBUG" = "yes" ]; then
   echo "###########################################"
 
   openvt -w -c $TTY /bin/sh &
-      ;;
 
-    poweroff|reboot)
-      ;;
-  esac
 fi

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
+if [ -f "$OPENELEC_SETTINGS" ]; then
-  boot)
-    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
+fi
-    ;;
-
-  poweroff|reboot)
-    ;;
-esac

packages/sysutils/busybox/init.d/04_userconfig

@@ -23,9 +23,7 @@
 #
 # runlevels: openelec, textmode
 
-case $RUNLEVEL in
+if [ -d /usr/config ]; then
-  boot)
-    if [ -d /usr/config ]; then
   progress "copy userconfig and samples"
 
     cd /usr/config
@@ -44,9 +42,4 @@ case $RUNLEVEL in
     for sample in `find . -type f -name "*.sample"`; do
       cp $sample /storage/.config/$sample
     done
-    fi
+fi
-    ;;
-
-  poweroff|reboot)
-    ;;
-esac

packages/sysutils/busybox/init.d/08_syslogd

@@ -23,22 +23,10 @@
 #
 # runlevels: openelec, installer, textmode
 
-case $RUNLEVEL in
+(
-  boot)
-    (
   progress "Starting Syslog daemon"
     syslogd
 
   progress "Starting Kernellog daemon"
     klogd
-    )&
+)&
-    ;;
-
-  poweroff|reboot)
-    progress "Stopping Kernellog daemon"
-      killall klogd
-
-    progress "Stopping Syslog daemon"
-      killall syslogd
-    ;;
-esac

packages/sysutils/busybox/init.d/10_cdrom

@@ -23,12 +23,5 @@
 #
 # runlevels: openelec, installer, textmode
 
-case $RUNLEVEL in
+progress "Setup some CDROM settings"
-  boot)
-    progress "Setup some CDROM settings"
   sysctl -w dev.cdrom.lock=0 > /dev/null 2>&1 &
-    ;;
-
-  poweroff|reboot)
-    ;;
-esac

packages/sysutils/busybox/init.d/99_shell

@@ -24,19 +24,12 @@
 
 TTY="1"
 
-case $RUNLEVEL in
+echo "###########################################"
-  boot)
+echo "## it seems we are running in Text mode. ##"
-    echo "###########################################"
+echo "## .... starting shell on console $TTY .... ##"
-    echo "## it seems we are running in Text mode. ##"
+echo "## ...... switch with ctrl-alt-f$TTY ...... ##"
-    echo "## .... starting shell on console $TTY .... ##"
+echo "###########################################"
-    echo "## ...... switch with ctrl-alt-f$TTY ...... ##"
-    echo "###########################################"
 
-    while true; do
+while true; do
   openvt -w -c $TTY /bin/sh
-    done
+done
-    ;;
-
-  poweroff|reboot)
-    ;;
-esac

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

packages/sysutils/busybox/scripts/init

@@ -26,6 +26,16 @@
 
   echo 0 > /sys/devices/virtual/graphics/fbcon/cursor_blink
 
+  mount -n -t devtmpfs none /dev
+
+  mkdir -p /dev/pts
+  mount -n -t devpts -o gid=5,mode=620 none /dev/pts
+
+  mkdir -p /dev/shm
+  mount -n -t tmpfs none /dev/shm
+
+  mount -n -t tmpfs none /run
+
 # showing version
   lsb_release
 
@@ -36,10 +46,8 @@
   progress "Starting Init Scripts"
     RET=0
 
-    RUNLEVEL="boot"
+    for script in /etc/init.d/*; do
-
+      if grep -q -e "^# runlevels:.*$RUNLEVEL" $script; then
-    for script in `ls -1 /etc/init.d/*`; do
-      if grep -q -e "^# runlevels:.*$MODE" $script; then
         . $script
         S_RET=$?
         test $S_RET -ge $RET && RET=$S_RET

packages/sysutils/dbus/init.d/14_dbus

@@ -23,19 +23,10 @@
 #
 # runlevels: openelec, textmode
 
-case $RUNLEVEL in
+(
-  boot)
-    (
   progress "Starting D-BUS"
 
   mkdir -p /var/lib/dbus /var/run/dbus
     dbus-uuidgen --ensure
     dbus-daemon --system
-    )&
+)&
-    ;;
-
-  poweroff|reboot)
-    progress "Stopping D-BUS"
-      killall dbus-daemon
-    ;;
-esac

packages/sysutils/fuse/init.d/15_fuse

@@ -23,14 +23,5 @@
 #
 # runlevels: openelec, textmode
 
-case $RUNLEVEL in
+progress "Starting Fuse"
-  boot)
-    progress "Starting Fuse"
   mount -t fusectl fusectl /sys/fs/fuse/connections >/dev/null 2>&1
-    ;;
-
-  poweroff|reboot)
-    progress "Stopping Fuse"
-      umount /sys/fs/fuse/connections
-    ;;
-esac

packages/sysutils/lcdproc/init.d/63_lcdproc

@@ -22,9 +22,7 @@
 #
 # runlevels: openelec, textmode
 
-case $RUNLEVEL in
+(
-  boot)
-    (
   if [ -f /var/config/settings.conf ]; then
     . /var/config/settings.conf
 
@@ -48,11 +46,4 @@ case $RUNLEVEL in
       LCDd -c $LCD_CONFIG -d $LCD_DRIVER -s true > /dev/null 2>&1
     fi
   fi
-    )&
+)&
-    ;;
-
-  poweroff|reboot)
-    progress "Stopping LCD daemon"
-      killall LCDd
-    ;;
-esac

packages/sysutils/remote/atvclient/init.d/63_atvclient

@@ -22,17 +22,8 @@
 #
 # runlevels: openelec, textmode
 
-case $RUNLEVEL in
+(
-  boot)
-    (
   progress "starting ATVclient"
     mkdir -p /storage/.cache
     atvclient -m > /dev/null 2>&1
-    )&
+)&
-    ;;
-
-  poweroff|reboot)
-    progress "stopping ATVclient"
-      killall atvclient
-    ;;
-esac

packages/sysutils/remote/eventlircd/init.d/62_eventlircd

@@ -22,17 +22,8 @@
 #
 # runlevels: openelec, textmode
 
-case $RUNLEVEL in
+(
-  boot)
-    (
   progress "starting eventlircd"
     mkdir -p /var/run/lirc
     eventlircd --evmap=/etc/eventlircd.d --socket=/var/run/lirc/lircd --release=_UP
-    )&
+)&
-    ;;
-
-  poweroff|reboot)
-    progress "starting eventlircd"
-      killall eventlircd
-    ;;
-esac

packages/sysutils/remote/irserver/init.d/61_irserver

@@ -25,9 +25,7 @@
 [ -f /storage/.config/remote.conf ] && . /storage/.config/remote.conf
 [ -f /storage/.config/lcd.conf ] && . /storage/.config/lcd.conf
 
-case $RUNLEVEL in
+if [ "$REMOTE_BACKEND" = "irtrans" -o "$LCD_DRIVER" = "irtrans" ]; then
-  boot)
-    if [ "$REMOTE_BACKEND" = "irtrans" -o "$LCD_DRIVER" = "irtrans" ]; then
 
   progress "Starting IRtrans daemon"
 
@@ -39,11 +37,4 @@ case $RUNLEVEL in
   irserver -logfile /var/log/irserver.log -pidfile /var/run/irserver.pid \
            $IRSERVER_ARG -daemon /dev/irtrans0 > /dev/null 2>&1
 
-    fi
+fi
-    ;;
-
-  poweroff|reboot)
-    progress "Stopping IRtrans daemon"
-      killall irserver
-    ;;
-esac

packages/sysutils/udev/init.d/11_udevd

@@ -23,16 +23,7 @@
 #
 # runlevels: openelec, installer, textmode
 
-case $RUNLEVEL in
+progress "starting udev daemon"
-  boot)
-    progress "starting udev daemon"
   echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
   mkdir -p /dev/rules.d
   udevd --daemon
-    ;;
-
-  poweroff|reboot)
-    progress "stopping udev daemon"
-      killall udevd
-    ;;
-esac

packages/sysutils/udev/init.d/12_udev-monitor

@@ -23,14 +23,7 @@
 #
 # runlevels: openelec, installer, textmode
 
-case $RUNLEVEL in
+(
-  boot)
   progress "monitoring udev events"
-      udevadm monitor -e > /dev/udev.log &
+    udevadm monitor -e > /dev/udev.log
-    ;;
+)&
-
-  poweroff|reboot)
-    progress "Stopping udev monitor"
-      killall udevadm
-    ;;
-esac

packages/sysutils/udev/init.d/13_udev-trigger

@@ -23,15 +23,8 @@
 #
 # runlevels: openelec, installer, textmode
 
-case $RUNLEVEL in
+(
-  boot)
-    (
   progress "request udev events from the kernel"
     udevadm trigger --action=add
     udevadm settle
-    )&
+)&
-    ;;
-
-  poweroff|reboot)
-    ;;
-esac

packages/sysutils/util-linux/init.d/32_swapfile

@@ -23,9 +23,7 @@
 #
 # runlevels: openelec, textmode
 
-case $RUNLEVEL in
+(
-  boot)
-    (
   INSTALLED_MEMORY=`cat /proc/meminfo | grep 'MemTotal:' | awk '{print $2}'`
   SWAP=`blkid -t TYPE="swap" -o device`
   SWAPFILE="$HOME/.cache/swapfile"
@@ -50,9 +48,4 @@ case $RUNLEVEL in
       sysctl -w vm.swappiness=60 2>&1 > /dev/null
     fi
   fi
-    )&
+)&
-    ;;
-
-  poweroff|reboot)
-    ;;
-esac

packages/x11/app/setxkbmap/init.d/72_keyboard

@@ -22,9 +22,7 @@
 #
 # runlevels: openelec
 
-case $RUNLEVEL in
+(
-  boot)
-    (
   if [ -f /var/config/settings.conf ]; then
     . /var/config/settings.conf
 
@@ -44,9 +42,4 @@ case $RUNLEVEL in
         setxkbmap -display $DISPLAY -layout "$X11_KEYMAP,$X11_KEYMAP2" -option "grp:alt_shift_toggle";
       fi
   fi
-    )&
+)&
-    ;;
-
-  poweroff|reboot)
-    ;;
-esac

packages/x11/other/ratpoison/init.d/73_ratpoison

@@ -22,9 +22,7 @@
 #
 # runlevels: openelec
 
-case $RUNLEVEL in
+(
-  boot)
-    (
   progress "starting Windowmanager"
 
   # waiting for Xorg to start
@@ -32,9 +30,4 @@ case $RUNLEVEL in
 
   # starting ratpoison
     DISPLAY=:0.0 ratpoison > /dev/null 2>&1
-    )&
+)&
-    ;;
-
-  poweroff|reboot)
-    ;;
-esac

packages/x11/xserver/xorg-server/init.d/70_xorg

@@ -1,34 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-#
-# mounting needed filesystems
-#
-# runlevels: openelec, installer, textmode
-
-case $RUNLEVEL in
-  boot)
-    # dont do anything here, we start xorg per udev
-    ;;
-  poweroff|reboot)
-    progress "stopping Xorg"
-      killall Xorg
-    ;;
-esac

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} ###"