diff options
| author | Michael Janczyk | 2008-02-15 23:16:21 +0100 |
|---|---|---|
| committer | Michael Janczyk | 2008-02-15 23:16:21 +0100 |
| commit | bd2a181f04922fb4417b2629dd79b852cedec4c3 (patch) | |
| tree | 5fe256d042d13020bf87b614f0c0516dce5f8e1d | |
| parent | test commit, splashy seems to be very picky (diff) | |
| download | core-bd2a181f04922fb4417b2629dd79b852cedec4c3.tar.gz core-bd2a181f04922fb4417b2629dd79b852cedec4c3.tar.xz core-bd2a181f04922fb4417b2629dd79b852cedec4c3.zip | |
changed runlevel linker stuff. debian needs splashy to term earlier, changed now via variable D_SPLASHY
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1546 95ad53e4-c205-0410-b2fa-d234c58c8868
5 files changed, 5 insertions, 6 deletions
diff --git a/initramfs/distro-specs/debian/config-default b/initramfs/distro-specs/debian/config-default index 84581990..7e426a2a 100644 --- a/initramfs/distro-specs/debian/config-default +++ b/initramfs/distro-specs/debian/config-default @@ -50,7 +50,7 @@ D_RCDIRS="/rc0.d /rc1.d /rc2.d /rc3.d /rc4.d /rc5.d /rc6.d" D_INITDEFAULT="3" # fixme: is keymap.sh really needed? Should be handled in a simpler fashion # via boot.slx (see hwautocfg) -D_INITSCRIPTS="mountkernfs.sh mountvirtfs udev procps.sh bootlogd keymap.sh hwclock.sh sudo dbus-1" +D_INITSCRIPTS="mountkernfs.sh mountvirtfs udev procps.sh bootlogd $D_SPLASHY keymap.sh hwclock.sh sudo dbus-1" D_XF86CONFFILE="/etc/X11/xorg.conf" D_XORGBIN=/usr/X11R6/bin/X D_XFONTPATH="/usr/X11R6/lib/X11/fonts/*" diff --git a/initramfs/distro-specs/gentoo/config-default b/initramfs/distro-specs/gentoo/config-default index 6cd78eea..a9687494 100644 --- a/initramfs/distro-specs/gentoo/config-default +++ b/initramfs/distro-specs/gentoo/config-default @@ -42,7 +42,7 @@ D_INITDIR="/init.d" D_INITBOOTD="/runlevels/boot" D_INITDEFAULT="3" D_RCDIRS="/runlevels/default /runlevels/single /runlevels/nonetwork" -D_INITSCRIPTS="localmount keymaps clock urandom resmgrd ivman local portmap" +D_INITSCRIPTS="localmount keymaps clock urandom resmgrd ivman local portmap $D_SPLASHY" D_XF86CONFFILE="/etc/X11/xorg.conf" D_XORGBIN=/usr/bin/Xorg D_XFONTPATH="/usr/share/fonts/*" diff --git a/initramfs/distro-specs/suse/config-default b/initramfs/distro-specs/suse/config-default index 1426bbc8..0e589adf 100644 --- a/initramfs/distro-specs/suse/config-default +++ b/initramfs/distro-specs/suse/config-default @@ -54,7 +54,7 @@ D_INITDEFAULT="5" D_RCDIRS="/init.d/rc0.d /init.d/rc1.d /init.d/rc2.d /init.d/rc3.d \ /init.d/rc4.d /init.d/rc5.d /init.d/rc6.d /init.d/rcS.d" D_INITSCRIPTS="boot.udev boot.proc boot.shm boot.klog boot.loadmodules \ -boot.clock boot.sysctl boot.ipconfig boot.swap" +boot.clock boot.sysctl boot.ipconfig boot.swap $D_SPLASHY" D_XF86CONFFILE="/etc/X11/xorg.conf" D_XORGBIN=/usr/X11R6/bin/Xorg D_XFONTPATH="/usr/X11R6/lib/X11/fonts/*" diff --git a/initramfs/distro-specs/ubuntu/config-default b/initramfs/distro-specs/ubuntu/config-default index 071b344e..59ada655 100644 --- a/initramfs/distro-specs/ubuntu/config-default +++ b/initramfs/distro-specs/ubuntu/config-default @@ -57,7 +57,7 @@ D_INITDIR="/init.d" D_INITBOOTD="/rcS.d" D_RCDIRS="/rc0.d /rc1.d /rc2.d /rc3.d /rc4.d /rc5.d /rc6.d" D_INITDEFAULT="3" -D_INITSCRIPTS="mountvirtfs keymap.sh procps.sh bootlogd hwclock.sh sudo" +D_INITSCRIPTS="mountvirtfs keymap.sh procps.sh bootlogd hwclock.sh sudo $D_SPLASHY" D_XF86CONFFILE="/etc/X11/xorg.conf" D_XORGBIN=/usr/X11R6/bin/X D_XFONTPATH="/usr/share/fonts/*" diff --git a/os-plugins/plugins/theme/init-hooks/05-have-kernelvars/theme.sh b/os-plugins/plugins/theme/init-hooks/05-have-kernelvars/theme.sh index 440dda12..8212b706 100644 --- a/os-plugins/plugins/theme/init-hooks/05-have-kernelvars/theme.sh +++ b/os-plugins/plugins/theme/init-hooks/05-have-kernelvars/theme.sh @@ -14,6 +14,5 @@ if [ ${theme_nosplash} -eq 0 ]; then /bin/splashy boot 2>/dev/null # add splashy.stop (XX_theme) to runlevel scripts - echo 'D_INITSCRIPTS="${D_INITSCRIPTS} splashy.stop"' \ - >> /etc/sysconfig/config + export D_SPLASHY=splashy.stop fi |