diff options
| author | Dirk von Suchodoletz | 2007-10-15 23:15:18 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2007-10-15 23:15:18 +0200 |
| commit | 9acd61c6749af849c5825e16b4af4f664f1a7b8c (patch) | |
| tree | 01ddabc58f0f92e0aaa64e63d010f5ab79204ada /initramfs/initrd-stuff/bin | |
| parent | old script for menulist. removed from fileserver. no need for it anymore (diff) | |
| download | core-9acd61c6749af849c5825e16b4af4f664f1a7b8c.tar.gz core-9acd61c6749af849c5825e16b4af4f664f1a7b8c.tar.xz core-9acd61c6749af849c5825e16b4af4f664f1a7b8c.zip | |
Fixes for changed directories in /etc (SuSE), fix for improper tar
filter while copying etc/ data (bind mounts). Do not copy splashy stuff
if not used and remove splashy after using ...
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1387 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/initrd-stuff/bin')
| -rwxr-xr-x | initramfs/initrd-stuff/bin/servconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig index d26a4213..dd768190 100755 --- a/initramfs/initrd-stuff/bin/servconfig +++ b/initramfs/initrd-stuff/bin/servconfig @@ -195,7 +195,8 @@ if [ ${nosplash} = 0 ]; then D_INITSCRIPTS="${D_INITSCRIPTS} splashy.stop" d_mkrlscript init splashy.stop "Stopping Splashy ..." echo -e "\t/var/lib/openslx/bin/splashy_update exit 2>/dev/null - \tkillall -9 splashy" >>/mnt/etc/${D_INITDIR}/splashy.stop + \tkillall -9 splashy\n\trm -f /var/lib/openslx/bin/splashy*" \ + >>/mnt/etc/${D_INITDIR}/splashy.stop d_mkrlscript close splashy.stop "" fi @@ -445,7 +446,7 @@ 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 -[ -d /etc/splashy ] && ( cp -a /etc/splashy /mnt/etc; \ +[ -d /etc/splashy -a ${nosplash} = 0 ] && ( cp -a /etc/splashy /mnt/etc; \ cp -a /bin/splashy* /mnt/var/lib/openslx/bin ) ############################################################################# |