theming should work now. bad hack, but works ok for first relase ;)

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

2 files changed, 19 insertions, 12 deletions

diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index 0dd15760..8228773f 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -5,7 +5,7 @@
 # system is setup when servconfig starts
 #
 # Dirk von Suchodoletz <dvs@OpenSLX.com>, 03-09-2006
-# Michael Janczyk <mj0>, 08-09-2006
+# Michael Janczyk <mj0>, 12-09-2006
 # Lars Mueller <lm@OpenSLX.com>, 23-06-2006
 # Oliver Tappe <ot@OpenSLX.com>, 23-06-2006
 #
@@ -316,10 +316,16 @@ Name[de]=Standard\nExec=defaultwm\nTryExec=/var/X11R6/bin/defaultwm\n\
 Type=Application" >/mnt/etc/X11/sessions/default.desktop
   rm /mnt/etc/vmware/not_configured 2>/dev/null
   echo -e "#!/bin/sh\n#\n# file generated by ${0} at ${date}\
-    \n# set to black background\nxsetroot -solid \"black\"\
+    \n# set X background\
+    \nres=\$(xvidtune -show | grep -wo \"\\\".*\\\"\" | sed \"s/\\\"//g\")\
+    \nif ! [ -f /var/lib/vmware/templ/corp-id/bootsplash/silent-\${res}.jpg ]; then
+    \n  img=\$(ls /etc/bootsplash/themes/dxs/images/ | grep -m 1 \"silent\")\
+    \n  display -window root /var/lib/vmware/templ/corp-id/bootsplash/images/\${img}\
+    \nelse\
+    \n  display -window root /var/lib/vmware/templ/corp-id/bootsplash/images/silent-\${res}.jpg\
+    \nfi
     \nstartvm=\$(echo \$0 | sed -e \"s,.*/,,\")\
-    \nxterm -bg black -fg white -geometry 100x30+0-0 +sb \
-    -e \"/var/X11R6/bin/runvmware -s \${startvm}\"\n" \
+    \n/var/X11R6/bin/runvmware -s \${startvm}\n"\
     > /mnt/var/X11R6/bin/desktop-session #${debug} removed
   chmod 755 /mnt/var/X11R6/bin/runvmware /mnt/var/X11R6/bin/defaultwm \
     /mnt/var/X11R6/bin/desktop-session >/dev/null 2>&1
@@ -501,9 +507,9 @@ DisplayManager.*.reset:\t\t/etc/X11/xdm/Xreset" \
 fi
 
 # theming
-mkdir -p /mnt/usr/share/themes/openslx
+mkdir -p /mnt/var/lib/openslx/themes
 cp -a /usr/share/themes/kdm /usr/share/themes/Xdialog \
-  /usr/share/themes/bootsplash /mnt/usr/share/themes/openslx >/dev/null 2>&1
+  /usr/share/themes/bootsplash /mnt/var/lib/openslx/themes >/dev/null 2>&1
 cp /usr/share/themes/kdm/kdmrc /mnt/etc/opt/kde3/share/config/kdm >/dev/null 2>&1
 
 # script run timer
diff --git a/initrd/mkdxsinitrd b/initrd/mkdxsinitrd
index acab08e8..4e151ae0 100755
--- a/initrd/mkdxsinitrd
+++ b/initrd/mkdxsinitrd
@@ -7,12 +7,12 @@
 # Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 03-09-2006
 #               Nico Dietrich
 #               Felix Endres
-#               mj0, 08-09-2006
+#               mj0, 12-09-2006 theming added
 #
 # Copyright:    (c) 2003 - 2006 - RZ Universitaet Freiburg
 #               (c) 2006 - openslx.org project
 #
-# Version:      0.4.5c
+# Version:      0.4.5d
 
 # debug level of script itself
 DEBUG=1
@@ -236,8 +236,8 @@ splash_bin=$(chroot $ROOTDIR which splash)
 if [ -n "$splashsizes" -a -n "$splash_bin" ]; then
 
   themes_dir="../theming/openslx/bootsplash"
-  if [ -d "/usr/share/openslx/themes/${theme}/bootsplash" ]; then
-    themes_dir="/usr/share/openslx/themes/${theme}/bootsplash"
+  if [ -d "/opt/openslx/share/themes/${theme}/bootsplash" ]; then
+    themes_dir="/opt/openslx/share/themes/${theme}/bootsplash"
   elif [ -d "$ROOTDIR/etc/bootsplash/themes/${theme}" ]; then
     themes_dir="/etc/bootsplash/themes/${theme}"
   elif [ -d "$ROOTDIR/usr/share/splash/themes/${theme}" ]; then
@@ -246,7 +246,8 @@ if [ -n "$splashsizes" -a -n "$splash_bin" ]; then
 
   #fixme: very ugly ;)
   mkdir -p $ROOTDIR/tmp/bootsplash
-  cp -a $themes_dir/* $ROOTDIR/tmp/bootsplash/
+  cp -a $themes_dir/* $ROOTDIR/tmp/bootsplash
+  themes=${themes_dir}
   themes_dir=$ROOTDIR/tmp/bootsplash
 
   if [ -n "$themes_dir" -a \
@@ -278,7 +279,7 @@ done
 rm -rf $ROOTDIR/tmp/bootsplash
 
 # kdm/Xdialog theme
-cp -a ../theming/${theme}/* ${INSTDIR}/usr/share/themes
+cp -a ${themes%bootsplash}* ${INSTDIR}/usr/share/themes
 }