mj0: bootsplash bugs removed

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@374 95ad53e4-c205-0410-b2fa-d234c58c8868

5 files changed, 16 insertions, 15 deletions

diff --git a/initrd/mkdxsinitrd b/initrd/mkdxsinitrd
index 4e151ae0..2b6141b4 100755
--- a/initrd/mkdxsinitrd
+++ b/initrd/mkdxsinitrd
@@ -7,7 +7,7 @@
 # Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 03-09-2006
 #               Nico Dietrich
 #               Felix Endres
-#               mj0, 12-09-2006 theming added
+#               mj0, 13-09-2006 theming added
 #
 # Copyright:    (c) 2003 - 2006 - RZ Universitaet Freiburg
 #               (c) 2006 - openslx.org project
@@ -247,7 +247,8 @@ if [ -n "$splashsizes" -a -n "$splash_bin" ]; then
   #fixme: very ugly ;)
   mkdir -p $ROOTDIR/tmp/bootsplash
   cp -a $themes_dir/* $ROOTDIR/tmp/bootsplash
-  themes=${themes_dir}
+  themes=${themes_dir%bootsplash}
+  echo -e "\n\tUsing ${themes} for themes.\n"
   themes_dir=$ROOTDIR/tmp/bootsplash
 
   if [ -n "$themes_dir" -a \
@@ -279,7 +280,7 @@ done
 rm -rf $ROOTDIR/tmp/bootsplash
 
 # kdm/Xdialog theme
-cp -a ${themes%bootsplash}* ${INSTDIR}/usr/share/themes
+cp -a ${themes}* ${INSTDIR}/usr/share/themes
 }
 
 
diff --git a/theming/openslx/bootsplash/config/bootsplash-1024x768.cfg b/theming/openslx/bootsplash/config/bootsplash-1024x768.cfg
index 4a23fbd9..2ecfc9f2 100644
--- a/theming/openslx/bootsplash/config/bootsplash-1024x768.cfg
+++ b/theming/openslx/bootsplash/config/bootsplash-1024x768.cfg
@@ -19,10 +19,10 @@ tw=994
 th=708
 
 
-jpeg=/etc/bootsplash/themes/dxs/images/bootsplash-1024x768.jpg
-silentjpeg=/etc/bootsplash/themes/dxs/images/silent-1024x768.jpg
+jpeg=/tmp/bootsplash/images/bootsplash-1024x768.jpg
+silentjpeg=/tmp/bootsplash/images/silent-1024x768.jpg
 
-mnganim anim /etc/bootsplash/themes/dxs/animations/spinner.mng silent center 512 614 scale 1024:1600
+mnganim anim /tmp/bootsplash/animations/spinner.mng silent center 512 614 scale 1024:1600
 
 trigger silent play anim
 trigger "isdown" quit
diff --git a/theming/openslx/bootsplash/config/bootsplash-1280x1024.cfg b/theming/openslx/bootsplash/config/bootsplash-1280x1024.cfg
index 15453f08..0ddf729f 100644
--- a/theming/openslx/bootsplash/config/bootsplash-1280x1024.cfg
+++ b/theming/openslx/bootsplash/config/bootsplash-1280x1024.cfg
@@ -19,10 +19,10 @@ tw=1250
 th=964
 
 
-jpeg=/etc/bootsplash/themes/dxs/images/bootsplash-1280x1024.jpg
-silentjpeg=/etc/bootsplash/themes/dxs/images/silent-1280x1024.jpg
+jpeg=/tmp/bootsplash/images/bootsplash-1280x1024.jpg
+silentjpeg=/tmp/bootsplash/images/silent-1280x1024.jpg
 
-mnganim anim /etc/bootsplash/themes/dxs/animations/spinner.mng silent center 640 819 scale 1280:1600
+mnganim anim /tmp/bootsplash/animations/spinner.mng silent center 640 819 scale 1280:1600
 
 trigger silent play anim
 trigger "isdown" quit
diff --git a/theming/openslx/bootsplash/config/bootsplash-640x480.cfg b/theming/openslx/bootsplash/config/bootsplash-640x480.cfg
index a5f1c3c9..f190272b 100644
--- a/theming/openslx/bootsplash/config/bootsplash-640x480.cfg
+++ b/theming/openslx/bootsplash/config/bootsplash-640x480.cfg
@@ -19,10 +19,10 @@ tw=610
 th=420
 
 
-jpeg=/etc/bootsplash/themes/dxs/images/bootsplash-640x480.jpg
-silentjpeg=/etc/bootsplash/themes/dxs/images/silent-640x480.jpg
+jpeg=/tmp/bootsplash/images/bootsplash-640x480.jpg
+silentjpeg=/tmp/bootsplash/images/silent-640x480.jpg
 
-mnganim anim /etc/bootsplash/themes/dxs/animations/spinner.mng silent center 320 384 scale 640:1600
+mnganim anim /tmp/bootsplash/animations/spinner.mng silent center 320 384 scale 640:1600
 
 trigger silent play anim
 trigger "isdown" quit
diff --git a/theming/openslx/bootsplash/config/bootsplash-800x600.cfg b/theming/openslx/bootsplash/config/bootsplash-800x600.cfg
index f0fb70e4..e19b566e 100644
--- a/theming/openslx/bootsplash/config/bootsplash-800x600.cfg
+++ b/theming/openslx/bootsplash/config/bootsplash-800x600.cfg
@@ -19,10 +19,10 @@ tw=770
 th=540
 
 
-jpeg=/etc/bootsplash/themes/dxs/images/bootsplash-800x600.jpg
-silentjpeg=/etc/bootsplash/themes/dxs/images/silent-800x600.jpg
+jpeg=/tmp/bootsplash/images/bootsplash-800x600.jpg
+silentjpeg=/tmp/bootsplash/images/silent-800x600.jpg
 
-mnganim anim /etc/bootsplash/themes/dxs/animations/spinner.mng silent center 400 480 scale 800:1600
+mnganim anim /tmp/bootsplash/animations/spinner.mng silent center 400 480 scale 800:1600
 
 trigger silent play anim
 trigger "isdown" quit