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

Conflicts:
	packages/sysutils/busybox/init.d/06_systemconfig

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

@@ -38,11 +38,8 @@ progress "make variable directory structure"
   touch /var/run/utmp
     chmod 1777 /var/run/utmp
 
-progress "make runtime directory structure"
-  ln -sf /storage/.config/modprobe.d /run/modprobe.d
-
 progress "make logging directory structure"
-  if test "$DEBUG" = "yes"; then
+  if [ ! "$RUNLEVEL" = "installer" -a "$DEBUG" = "yes" ]; then
     mkdir -p $HOME/log
     ln -sf $HOME/log /var/log
   else
@@ -52,19 +49,24 @@ progress "make logging directory structure"
   touch /var/log/wtmp
     chmod 1777 /var/log/wtmp
 
-progress "make variable library directory structure"
-# 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
+if [ ! "$RUNLEVEL" = "installer" ]; then
+  progress "make runtime directory structure"
+    ln -sf /storage/.config/modprobe.d /run/modprobe.d
 
-  mkdir -p /var/lib/udisks
-  mkdir -p /var/lib/upower
+  progress "make variable library directory structure"
+  # 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
 
-progress "make caching directory structure"
-  mkdir -p $HOME/.cache/bluetooth
-  ln -sf $HOME/.cache/bluetooth /var/lib/bluetooth
+    mkdir -p /var/lib/udisks
+    mkdir -p /var/lib/upower
+
+  progress "make caching directory structure"
+    mkdir -p $HOME/.cache/bluetooth
+    ln -sf $HOME/.cache/bluetooth /var/lib/bluetooth
+fi

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

@@ -21,7 +21,7 @@
 #
 # setup cdrom settings
 #
-# runlevels: openelec, installer, textmode
+# runlevels: openelec, textmode
 
 progress "Setup some CDROM settings"
   sysctl -w dev.cdrom.lock=0 > /dev/null 2>&1 &

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

@@ -21,7 +21,7 @@
 #
 # start syslog daemon
 #
-# runlevels: openelec, installer, textmode
+# runlevels: openelec, textmode
 
 (
   progress "Starting Syslog daemon"

packages/sysutils/busybox/profile.d/safe-shutdown.conf

@@ -27,7 +27,18 @@
     omit_pids+=( $@ )
   }
 
+  _shutdown_script () {
+    SHUTDOWN="/storage/.config/shutdown.sh"
+    if [ -f $SHUTDOWN ]; then
+      echo '!!! SHUTDOWN script detected !!!' | logger -t shutdown.sh
+      cat "$SHUTDOWN" | logger -t shutdown.sh
+      echo '!!! -End of shutdown script- !!!' | logger -t shutdown.sh
+      sh $SHUTDOWN
+    fi
+  }
+
   _safe_shutdown () {
+    _shutdown_script
     add_omit_pids $(pidof connmand)
     add_omit_pids $(pidof dbus-daemon)
     killall5 -15 ${omit_pids[@]/#/-o }

packages/sysutils/timezone-data/init.d/03_timezone

@@ -21,7 +21,7 @@
 #
 # make variable directory structure
 #
-# runlevels: openelec, installer, textmode
+# runlevels: openelec, textmode
 
 progress "setting timezone"
   GUISETTINGS="/storage/.xbmc/userdata/guisettings.xml"