diff options
| author | Michael Janczyk | 2007-09-11 22:02:00 +0200 |
|---|---|---|
| committer | Michael Janczyk | 2007-09-11 22:02:00 +0200 |
| commit | f6c98190cc5211e0580f567daa00319b8b5bff9f (patch) | |
| tree | 3d4cc5703c8590f76326b63b4279c809a52848cf /initramfs | |
| parent | removed old bootsplash2 dir. (diff) | |
| download | core-f6c98190cc5211e0580f567daa00319b8b5bff9f.tar.gz core-f6c98190cc5211e0580f567daa00319b8b5bff9f.tar.xz core-f6c98190cc5211e0580f567daa00319b8b5bff9f.zip | |
minor theme modifications
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1337 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs')
| -rwxr-xr-x | initramfs/initrd-stuff/bin/servconfig | 5 | ||||
| -rwxr-xr-x | initramfs/initrd-stuff/init | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig index a5f100c1..277e482b 100755 --- a/initramfs/initrd-stuff/bin/servconfig +++ b/initramfs/initrd-stuff/bin/servconfig @@ -431,10 +431,11 @@ fi ############################################################################# # theming testmkd /mnt/var/lib/openslx/themes/displaymanager +testmkd /mnt/var/lib/openslx/bin [ -d /usr/share/themes/displaymanager ] && \ - cp -a /usr/share/themes/displaymanager mnt/var/lib/openslx/themes + cp -a /usr/share/themes/displaymanager /mnt/var/lib/openslx/themes [ -d /etc/splashy ] && ( cp -a /etc/splashy /mnt/etc; \ - cp -a /bin/splashy* /var/lib/openslx/bin ) + cp -a /bin/splashy* /mnt/var/lib/openslx/bin ) ############################################################################# # preparation of /tmp directory (partition 44, nfs scratch, ramdisk). there diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init index 0cb53fb1..f70cca8c 100755 --- a/initramfs/initrd-stuff/init +++ b/initramfs/initrd-stuff/init @@ -868,6 +868,7 @@ unset BOOT_IMAGE KCMDLINE KERNEL MODPRV NWMODULES OLDPWD UDEVD_EVENT_TIMEOUT \ && /bin/splashy_update "progress 100" 2>/dev/null [ ${DEBUGLEVEL} = 0 -a ${nosplash} = 0 ] \ && /bin/splashy_update exit 2>/dev/null +killall -9 splashy 2>/dev/null # new style of pivoting (switch_root or run-init) exec /bin/switch_root -c dev/console /mnt /sbin/init || error "$init_runinit" |