From f290900375fad9f7998001d7f65bd2624c3e48ed Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 15 Mar 2010 18:35:21 +0100 Subject: [PATCH] busybox: - adding init script for mounting filesystem (move from /sbin/init) - adding init script for making /var directory structure (move from /sbin/init) - adding init script for copying userconfig (move from /sbin/init) - start syslogd later - start networking later - start debugshell later - use getty for debugshell - start acpid daemon later - use getty for textmode shell --- .../busybox/init.d/01_mount_filesystem | 8 +++ .../busybox/init.d/02_make_directorys | 15 +++++ .../sysutils/busybox/init.d/03_userconfig | 13 +++++ .../busybox/init.d/{02_network => 04_network} | 0 .../busybox/init.d/{01_syslogd => 10_syslogd} | 0 .../init.d/{10_debugshell => 21_debugshell} | 3 +- .../busybox/init.d/{14_acpid => 23_acpid} | 0 packages/sysutils/busybox/init.d/99_shell | 3 +- packages/sysutils/busybox/scripts/init | 58 ------------------- 9 files changed, 40 insertions(+), 60 deletions(-) create mode 100755 packages/sysutils/busybox/init.d/01_mount_filesystem create mode 100755 packages/sysutils/busybox/init.d/02_make_directorys create mode 100755 packages/sysutils/busybox/init.d/03_userconfig rename packages/sysutils/busybox/init.d/{02_network => 04_network} (100%) rename packages/sysutils/busybox/init.d/{01_syslogd => 10_syslogd} (100%) rename packages/sysutils/busybox/init.d/{10_debugshell => 21_debugshell} (78%) rename packages/sysutils/busybox/init.d/{14_acpid => 23_acpid} (100%) diff --git a/packages/sysutils/busybox/init.d/01_mount_filesystem b/packages/sysutils/busybox/init.d/01_mount_filesystem new file mode 100755 index 0000000000..2d53d275fa --- /dev/null +++ b/packages/sysutils/busybox/init.d/01_mount_filesystem @@ -0,0 +1,8 @@ +# +# mounting needed filesystems +# +# runlevels: openelec, text + +progress "mounting needed filesystems" + + $IONICE 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 new file mode 100755 index 0000000000..d289e0dfab --- /dev/null +++ b/packages/sysutils/busybox/init.d/02_make_directorys @@ -0,0 +1,15 @@ +# +# make variable directory structure +# +# runlevels: openelec, text + +progress "make variable directory structure" + $IONICE mkdir -p /var/log \ + /var/lock \ + /var/media \ + /var/run \ + /var/tmp \ + /var/run/sepermit + + $IONICE chmod 1777 /var/run /var/tmp + diff --git a/packages/sysutils/busybox/init.d/03_userconfig b/packages/sysutils/busybox/init.d/03_userconfig new file mode 100755 index 0000000000..e11f33fa18 --- /dev/null +++ b/packages/sysutils/busybox/init.d/03_userconfig @@ -0,0 +1,13 @@ +# +# copying config into storage +# +# runlevels: openelec, text + +progress "copying config into storage" + + $IONICE mkdir -p $HOME/.config + + for i in `ls /usr/config`; do + [ ! -f "$HOME/.config/$i" ] && cp -PR /usr/config/$i $HOME/.config + done + diff --git a/packages/sysutils/busybox/init.d/02_network b/packages/sysutils/busybox/init.d/04_network similarity index 100% rename from packages/sysutils/busybox/init.d/02_network rename to packages/sysutils/busybox/init.d/04_network diff --git a/packages/sysutils/busybox/init.d/01_syslogd b/packages/sysutils/busybox/init.d/10_syslogd similarity index 100% rename from packages/sysutils/busybox/init.d/01_syslogd rename to packages/sysutils/busybox/init.d/10_syslogd diff --git a/packages/sysutils/busybox/init.d/10_debugshell b/packages/sysutils/busybox/init.d/21_debugshell similarity index 78% rename from packages/sysutils/busybox/init.d/10_debugshell rename to packages/sysutils/busybox/init.d/21_debugshell index f957b55e99..df87f538b4 100755 --- a/packages/sysutils/busybox/init.d/10_debugshell +++ b/packages/sysutils/busybox/init.d/21_debugshell @@ -12,6 +12,7 @@ if [ "$DEBUG" = "yes" ]; then echo "## ...... switch with ctrl-alt-f$TTY ...... ##" echo "###########################################" - exec /bin/sh /dev/tty$TTY 2>&1 & +# exec /bin/sh /dev/tty$TTY 2>&1 & + exec /sbin/getty -n -l /bin/sh 38400 tty$TTY & fi diff --git a/packages/sysutils/busybox/init.d/14_acpid b/packages/sysutils/busybox/init.d/23_acpid similarity index 100% rename from packages/sysutils/busybox/init.d/14_acpid rename to packages/sysutils/busybox/init.d/23_acpid diff --git a/packages/sysutils/busybox/init.d/99_shell b/packages/sysutils/busybox/init.d/99_shell index 470b942086..6382da0947 100755 --- a/packages/sysutils/busybox/init.d/99_shell +++ b/packages/sysutils/busybox/init.d/99_shell @@ -11,5 +11,6 @@ echo "## ...... switch with ctrl-alt-f$TTY ...... ##" echo "###########################################" while true; do - exec /bin/sh /dev/tty$TTY 2>&1 +# exec /bin/sh /dev/tty$TTY 2>&1 + exec /sbin/getty -n -l /bin/sh 38400 tty$TTY done diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index 4a538b5fdc..57254d6e8e 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -3,64 +3,6 @@ # read config . /etc/sysconfig -# Starting Splash - [ "$DEBUG" != "yes" \ - -a "$TEXTMODE" != "yes" \ - -a -f /usr/bin/ply-image \ - -a -f /usr/share/splash/Splash.png \ - ] && ply-image /usr/share/splash/Splash.png & - -# mounting needed filesystems - progress "mounting needed filesystems" - $IONICE mount -n -t ramfs none /var - -# make variable directory structure - progress "make variable directory structure" - $IONICE mkdir -p /var/log \ - /var/lock \ - /var/media \ - /var/run \ - /var/tmp \ - /var/run/sepermit - - $IONICE chmod 1777 /var/run /var/tmp - -# copying config into storage - progress "copying config into storage" - mkdir -p $HOME/.config - for i in `ls /usr/config`; do - [ ! -f "$HOME/.config/$i" ] && \ - cp -PR /usr/config/$i $HOME/.config - done - -# caching xbmc - [ "$XBMC_CACHING" = "yes" ] && cache_xbmc - -# starting Udev - progress "starting Udev" - echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug - $NICE_20 udevd --daemon - $NICE_20 udevadm monitor 2>&1 >/var/log/udev.log & - $NICE_20 udevadm control --env STARTUP=1 - ( - $NICE_20 udevadm trigger - $NICE_20 udevadm settle --timeout=5 - $NICE_20 udevadm control --env STARTUP= - )& - -# starting dbus - progress "Starting D-BUS" - $IONICE mkdir -p /var/lib/dbus /var/run/dbus - dbus-daemon --system - dbus-uuidgen --ensure - -# starting HAL - progress "Starting Hardware Abstraction Layer" - $IONICE mkdir -p /var/cache/hald - $IONICE mkdir -p /var/run/dbus/hald-local - $IONICE mkdir -p /var/run/dbus/hald-runner - hald --verbose=no --daemon=yes --use-syslog - # getting runlevel RUNLEVEL="openelec" if test "$TEXTMODE" = yes; then