From f6c98190cc5211e0580f567daa00319b8b5bff9f Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Tue, 11 Sep 2007 20:02:00 +0000
Subject: minor theme modifications

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1337 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/initrd-stuff/bin/servconfig | 5 +++--
 initramfs/initrd-stuff/init           | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'initramfs')

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"
-- 
cgit v1.2.3-55-g7522