From 4858cf3e0f4c6a4d74b19fa5ca31115460fe5f6e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 28 Mar 2009 00:01:06 +0100 Subject: [PATCH] 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 +++- packages/linux/init.d/01_date | 6 +++++- packages/linux/init.d/20_modules | 6 ++++-- packages/network/avahi/init.d/43_avahi | 4 +++- packages/network/bluez/init.d/22_bluetooth | 4 +++- packages/network/connman/init.d/42_connman | 4 +++- .../sysutils/automountd/init.d/21_automountd | 4 +++- packages/sysutils/busybox/init.d/13_syslogd | 4 +++- packages/sysutils/busybox/init.d/52_telnet | 4 +++- packages/sysutils/busybox/init.d/53_httpd | 4 +++- packages/sysutils/busybox/init.d/54_crond | 4 +++- packages/sysutils/busybox/init.d/80_debug | 6 +++--- packages/sysutils/busybox/init.d/99_shutdown | 6 ++++-- packages/sysutils/busybox/scripts/init.system | 9 ++------- packages/sysutils/hal/init.d/20_hal | 4 +++- packages/sysutils/udev/init.d/01_udev | 2 +- packages/virtual/Xorg/init.d/65_xorg | 2 +- packages/virtual/image/config/etc/conf.d/core | 13 +++++-------- packages/virtual/image/config/etc/sysconfig | 17 ++++++++++++++++- .../gtk+/init.d/64_gdk-query-pixbuf-loaders | 2 +- .../pango/init.d/64_pango-querymodules | 2 +- .../x11/app/xinit/scripts/xinitrc.d/99_elisa | 6 +++++- 22 files changed, 78 insertions(+), 39 deletions(-) diff --git a/packages/devel/dbus/init.d/15_dbus b/packages/devel/dbus/init.d/15_dbus index d4bbc03ccb..0399d489a6 100755 --- a/packages/devel/dbus/init.d/15_dbus +++ b/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 diff --git a/packages/linux/init.d/01_date b/packages/linux/init.d/01_date index 141fc692db..3969fdc419 100644 --- a/packages/linux/init.d/01_date +++ b/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 diff --git a/packages/linux/init.d/20_modules b/packages/linux/init.d/20_modules index 6c7986fdd2..000bd8c195 100755 --- a/packages/linux/init.d/20_modules +++ b/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=' ' diff --git a/packages/network/avahi/init.d/43_avahi b/packages/network/avahi/init.d/43_avahi index da6476bbbd..f24e08c3e1 100755 --- a/packages/network/avahi/init.d/43_avahi +++ b/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 diff --git a/packages/network/bluez/init.d/22_bluetooth b/packages/network/bluez/init.d/22_bluetooth index 103fd7e05b..dc93df7b43 100755 --- a/packages/network/bluez/init.d/22_bluetooth +++ b/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 diff --git a/packages/network/connman/init.d/42_connman b/packages/network/connman/init.d/42_connman index 8cf7680b03..9892d417b0 100755 --- a/packages/network/connman/init.d/42_connman +++ b/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 diff --git a/packages/sysutils/automountd/init.d/21_automountd b/packages/sysutils/automountd/init.d/21_automountd index b3242c6514..c3cb6f0e8f 100755 --- a/packages/sysutils/automountd/init.d/21_automountd +++ b/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 diff --git a/packages/sysutils/busybox/init.d/13_syslogd b/packages/sysutils/busybox/init.d/13_syslogd index 6369d79912..8ef002dc44 100755 --- a/packages/sysutils/busybox/init.d/13_syslogd +++ b/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 diff --git a/packages/sysutils/busybox/init.d/52_telnet b/packages/sysutils/busybox/init.d/52_telnet index a299e6a4cf..bfa314522e 100755 --- a/packages/sysutils/busybox/init.d/52_telnet +++ b/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 diff --git a/packages/sysutils/busybox/init.d/53_httpd b/packages/sysutils/busybox/init.d/53_httpd index 560492184f..131f39504e 100755 --- a/packages/sysutils/busybox/init.d/53_httpd +++ b/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 diff --git a/packages/sysutils/busybox/init.d/54_crond b/packages/sysutils/busybox/init.d/54_crond index e70a5805b1..c7b499305b 100755 --- a/packages/sysutils/busybox/init.d/54_crond +++ b/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 diff --git a/packages/sysutils/busybox/init.d/80_debug b/packages/sysutils/busybox/init.d/80_debug index 7b5bf992ac..f05ca897d4 100755 --- a/packages/sysutils/busybox/init.d/80_debug +++ b/packages/sysutils/busybox/init.d/80_debug @@ -4,9 +4,9 @@ # # runlevels: text -# start shell +. /etc/sysconfig -echo "### starting debug shell ###" -echo "*** type exit to exit ***" +progress "starting debug shell" + echo "*** type exit to exit ***" exec /bin/sh /dev/tty1 2>&1 diff --git a/packages/sysutils/busybox/init.d/99_shutdown b/packages/sysutils/busybox/init.d/99_shutdown index 5db928d134..480014f079 100755 --- a/packages/sysutils/busybox/init.d/99_shutdown +++ b/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 diff --git a/packages/sysutils/busybox/scripts/init.system b/packages/sysutils/busybox/scripts/init.system index c388d4f203..58af7fb32f 100755 --- a/packages/sysutils/busybox/scripts/init.system +++ b/packages/sysutils/busybox/scripts/init.system @@ -19,10 +19,7 @@ for arg in $(cat /proc/cmdline); do case $arg in - debugging) - DEBUG=yes - ;; - text) + textmode) TEXTMODE=yes ;; configure) @@ -46,9 +43,7 @@ tar xaf "/usr/config/etc.tar.lzma" -C /storage RUNLEVEL="openelec" - if test "$DEBUG" = yes; then - RUNLEVEL="debug" - elif test "$TEXTMODE" = yes; then + if test "$TEXTMODE" = yes; then RUNLEVEL="text" elif test "$CONFIGURE" = yes; then RUNLEVEL="configure" diff --git a/packages/sysutils/hal/init.d/20_hal b/packages/sysutils/hal/init.d/20_hal index bb71c20dcc..e7d4955223 100755 --- a/packages/sysutils/hal/init.d/20_hal +++ b/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 diff --git a/packages/sysutils/udev/init.d/01_udev b/packages/sysutils/udev/init.d/01_udev index 742ed3da94..fd4a380be3 100755 --- a/packages/sysutils/udev/init.d/01_udev +++ b/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 diff --git a/packages/virtual/Xorg/init.d/65_xorg b/packages/virtual/Xorg/init.d/65_xorg index 2379bfd586..571f340dc8 100755 --- a/packages/virtual/Xorg/init.d/65_xorg +++ b/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/ diff --git a/packages/virtual/image/config/etc/conf.d/core b/packages/virtual/image/config/etc/conf.d/core index a6285d9bce..2603346cb3 100644 --- a/packages/virtual/image/config/etc/conf.d/core +++ b/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 \ No newline at end of file diff --git a/packages/virtual/image/config/etc/sysconfig b/packages/virtual/image/config/etc/sysconfig index abfc2e763b..48b32e38e0 100644 --- a/packages/virtual/image/config/etc/sysconfig +++ b/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 diff --git a/packages/x11-toolkits/gtk+/init.d/64_gdk-query-pixbuf-loaders b/packages/x11-toolkits/gtk+/init.d/64_gdk-query-pixbuf-loaders index 81e0363492..da04c872c4 100755 --- a/packages/x11-toolkits/gtk+/init.d/64_gdk-query-pixbuf-loaders +++ b/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} diff --git a/packages/x11-toolkits/pango/init.d/64_pango-querymodules b/packages/x11-toolkits/pango/init.d/64_pango-querymodules index 5fe9fb3ef9..85174aa475 100755 --- a/packages/x11-toolkits/pango/init.d/64_pango-querymodules +++ b/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} diff --git a/packages/x11/app/xinit/scripts/xinitrc.d/99_elisa b/packages/x11/app/xinit/scripts/xinitrc.d/99_elisa index 5104cbe41f..4eea3db5d8 100644 --- a/packages/x11/app/xinit/scripts/xinitrc.d/99_elisa +++ b/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 \ No newline at end of file