changing runlevelsystem. you have now follow opportunities: 1 adding -textmode- as kernel parameter starts a textshell 2. adding -debugging- starts elisa in verbose mode and with additional logfiles 3. adding -textmode debugging- starts textshell in verbose mode and with additional logfiles 4. adding nothing starts elisa in quiet mode without creating additional logfiles

packages/devel/dbus/init.d/15_dbus

@@ -4,8 +4,10 @@
 #
 # runlevels: openelec, text, debug
 
+. /etc/sysconfig
+
 if test -f /usr/bin/dbus-daemon; then
-  echo "### Starting D-BUS ###"
+  progress "Starting D-BUS"
 
   mkdir -p /var/run/dbus
   mkdir -p /var/lib/dbus

packages/linux/init.d/01_date

@@ -2,6 +2,10 @@
 #
 # store boot time
 #
-# runlevels: openelec, debug
+# runlevels: openelec, text, debug
+
+. /etc/sysconfig
+
+progress "saving Starttime"
 
 /bin/date > /tmp/bootdate

packages/linux/init.d/20_modules

@@ -2,9 +2,11 @@
 #
 # load modules
 #
-# runlevels: openelec, debug, configure
+# runlevels: openelec, text, debug
 
-echo "### Loading kernel modules ###"
+. /etc/sysconfig
+
+progress "Loading kernel modules"
 
 IFS='
 '

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

@@ -4,9 +4,11 @@
 #
 # runlevels: openelec, text, debug
 
+. /etc/sysconfig
+
 if test -f /usr/sbin/avahi-daemon; then
 
-  echo "### Starting Avahi Daemon ###"
+  progress "Starting Avahi Daemon"
 
   mkdir -p /var/run/avahi-daemon
   avahi-daemon -D

packages/network/bluez/init.d/22_bluetooth

@@ -4,7 +4,9 @@
 #
 # runlevels: openelec, text, debug
 
-echo "### Starting Bluetooth support ###"
+. /etc/sysconfig
+
+progress "Starting Bluetooth support"
 
 /usr/bin/bluetoothd 
 

packages/network/connman/init.d/42_connman

@@ -4,8 +4,10 @@
 #
 # runlevels: openelec, text, debug
 
+. /etc/sysconfig
+
 if test -f /usr/sbin/connmand; then
-  echo "### Starting Connection Manager ###"
+  progress "Starting Connection Manager"
 
   connmand -d
 fi

packages/sysutils/automountd/init.d/21_automountd

@@ -4,9 +4,11 @@
 #
 # runlevels: openelec, text, debug
 
+. /etc/sysconfig
+
 if test -f /usr/bin/automountd; then
 
-  echo "### Starting D-BUS/HAL automounter ###"
+  progress "Starting D-BUS/HAL automounter"
 
   automountd -d > /dev/null 2>&1
 

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

@@ -4,7 +4,9 @@
 #
 # runlevels: openelec, text, debug
 
-echo "### Starting Syslog daemon ###"
+. /etc/sysconfig
+
+progress "Starting Syslog daemon"
 
   mkdir -p /var/log
   syslogd

packages/sysutils/busybox/init.d/52_telnet

@@ -4,12 +4,14 @@
 #
 # runlevels: openelec, text, debug
 
+. /etc/sysconfig
+
 # get options
 test -f /etc/network || exit 1
 . /etc/network
 
 if test "$TELNET_SERVER" = "yes" -a -f /etc/issue; then
-  echo "### Starting telnet daemon ###"
+  progress "Starting telnet daemon"
   telnetd -f /etc/issue >/dev/null 2>&1 &
 fi
 

packages/sysutils/busybox/init.d/53_httpd

@@ -4,12 +4,14 @@
 #
 # runlevels: openelec, text, debug
 
+. /etc/sysconfig
+
 # get options
 test -f /etc/network || exit 1
 . /etc/network
 
 if test "$HTTP_SERVER" = "yes"; then
-  echo "### Starting http daemon ###"
+  progress "Starting http daemon"
   httpd -h /var/www >/dev/null 2>&1 &
 fi
 

packages/sysutils/busybox/init.d/54_crond

@@ -4,7 +4,9 @@
 #
 # runlevels: openelec, text, debug
 
-echo "### Starting CRON daemon ###"
+. /etc/sysconfig
+
+progress "Starting CRON daemon"
 
   mkdir -p /var/spool/cron/crontabs
   crond -S

packages/sysutils/busybox/init.d/80_debug

@@ -4,9 +4,9 @@
 #
 # runlevels: text
 
-# start shell
+. /etc/sysconfig
 
-echo "### starting debug shell ###"
+progress "starting debug shell"
-echo "*** type   exit  to exit ***"
 
+  echo "*** type   exit  to exit ***"
   exec /bin/sh </dev/tty1 >/dev/tty1 2>&1

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

@@ -4,8 +4,10 @@
 #
 # runlevels: openelec, text, debug,
 
-echo "### syncing discs ###"
+. /etc/sysconfig
+
+progress "syncing discs"
   sync
 
-echo "### shutdown the system ###"
+progress "shutdown the system"
   poweroff

packages/sysutils/busybox/scripts/init.system

@@ -19,10 +19,7 @@
 
   for arg in $(cat /proc/cmdline); do
     case $arg in
-      debugging)
+      textmode)
-        DEBUG=yes
-        ;;
-      text)
         TEXTMODE=yes
         ;;
       configure)
@@ -46,9 +43,7 @@
   tar xaf "/usr/config/etc.tar.lzma" -C /storage
 
   RUNLEVEL="openelec"
-  if test "$DEBUG" = yes; then
+  if test "$TEXTMODE" = yes; then
-    RUNLEVEL="debug"
-  elif test "$TEXTMODE" = yes; then
     RUNLEVEL="text"
   elif test "$CONFIGURE" = yes; then
     RUNLEVEL="configure"

packages/sysutils/hal/init.d/20_hal

@@ -4,9 +4,11 @@
 #
 # runlevels: openelec, text, debug
 
+. /etc/sysconfig
+
 if test -f /usr/sbin/hald; then
 
-  echo "### Starting Hardware Abstraction Layer ###"
+  progress "Starting Hardware Abstraction Layer"
 
   mkdir -p /var/cache/hald
   mkdir -p /var/run/dbus/hald-local

packages/sysutils/udev/init.d/01_udev

@@ -8,7 +8,7 @@
 
 if test -f /usr/sbin/udevd; then
 
-  echo "### starting Udev ###"
+  progress "starting Udev"
 
   export UDEV_MAX_CHILDS=2
   export UDEV_MAX_CHILDS_RUNNING=2

packages/virtual/Xorg/init.d/65_xorg

@@ -6,7 +6,7 @@
 
 . /etc/sysconfig
 
-echo "### starting Xorg ###"
+progress "starting Xorg"
 
 #  modprobe drm
 mkdir -p /var/lib/xkb/

packages/virtual/image/config/etc/conf.d/core

@@ -47,16 +47,13 @@ export TTY
 #-------------------------------------------------------------------------------
 OE_X_WM_ENABLED=yes
 
-#-------------------------------------------------------------------------------
-# Default Font for WindowManager
-#-------------------------------------------------------------------------------
-WM_FONT='-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1'
-
 #-------------------------------------------------------------------------------
 # Elisas environment variables.
 #-------------------------------------------------------------------------------
-ELISA_DEBUG=yes
 ELISA_FULLSCREEN=yes
-ELISA_TMPLOG=yes
 
-ELISA_LOGFILE='/var/log/elisa.log'
+if test "$DEBUG" = yes; then
+  ELISA_DEBUG=yes
+  ELISA_TMPLOG=yes
+  ELISA_LOGFILE='/var/log/elisa.log'
+fi

packages/virtual/image/config/etc/sysconfig

@@ -1,5 +1,20 @@
+# parse command line arguments
+for arg in $(cat /proc/cmdline); do
+  case $arg in
+    debugging)
+      DEBUG=yes
+      ;;
+  esac
+done
+
+progress() {
+  if test "$DEBUG" = yes; then
+    echo "### $1 ###"
+  fi
+}
+
 /usr/bin/test -r /etc/conf.d/boot          && . /etc/conf.d/boot
 /usr/bin/test -r /etc/conf.d/core          && . /etc/conf.d/core
-/usr/bin/test -r /etc/conf.d/dhcp.override && . /etc/conf.d/dhcp.override
+/usr/bin/test -r /etc/conf.d/debug         && . /etc/conf.d/dhcp.override
 /usr/bin/test -r /etc/conf.d/dhcp          && . /etc/conf.d/dhcp
 /usr/bin/test -r /etc/conf.d/elisa         && . /etc/conf.d/elisa

packages/x11-toolkits/gtk+/init.d/64_gdk-query-pixbuf-loaders

@@ -9,7 +9,7 @@
 FILE=/etc/gtk-2.0/gdk-pixbuf.loaders
 
   if [ ! -e ${FILE} ]; then
-    echo "### setting up GTK ###"
+    progress "setting up GTK"
 
       mkdir -p $(dirname ${FILE})
         gdk-pixbuf-query-loaders > ${FILE}

packages/x11-toolkits/pango/init.d/64_pango-querymodules

@@ -9,7 +9,7 @@
 FILE=/etc/pango/pango.modules
 
   if [ ! -e ${FILE} ]; then
-    echo "### setting up Pango ###"
+    progress "setting up Pango"
 
       mkdir -p $(dirname ${FILE})
         pango-querymodules > ${FILE}

packages/x11/app/xinit/scripts/xinitrc.d/99_elisa

@@ -23,4 +23,8 @@ if /usr/bin/test "${ELISA_TMPLOG}" = "yes" ; then
     args="${args} -l"
 fi
 
-/usr/bin/elisa ${args} 2> $ELISA_LOGFILE
+if /usr/bin/test "${ELISA_DEBUG}" = "yes" ; then
+  /usr/bin/elisa ${args} 2> $ELISA_LOGFILE
+else
+  /usr/bin/elisa ${args} > /dev/null 2>&1
+fi