need to commit, for testing, maybe some bugs

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

2 files changed, 39 insertions, 18 deletions

diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index 67971c82..0dd15760 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>, 31-05-2006
+# Michael Janczyk <mj0>, 08-09-2006
 # Lars Mueller <lm@OpenSLX.com>, 23-06-2006
 # Oliver Tappe <ot@OpenSLX.com>, 23-06-2006
 #
@@ -500,6 +500,12 @@ DisplayManager.*.reset:\t\t/etc/X11/xdm/Xreset" \
   esac
 fi
 
+# theming
+mkdir -p /mnt/usr/share/themes/openslx
+cp -a /usr/share/themes/kdm /usr/share/themes/Xdialog \
+  /usr/share/themes/bootsplash /mnt/usr/share/themes/openslx >/dev/null 2>&1
+cp /usr/share/themes/kdm/kdmrc /mnt/etc/opt/kde3/share/config/kdm >/dev/null 2>&1
+
 # script run timer
 [ $DEBUGLEVEL -eq 8 ] && echo "** SW setup finished at $(sysup)"
 
diff --git a/initrd/mkdxsinitrd b/initrd/mkdxsinitrd
index ea1fd16c..e5b7f310 100755
--- a/initrd/mkdxsinitrd
+++ b/initrd/mkdxsinitrd
@@ -7,6 +7,7 @@
 # Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 03-09-2006
 #               Nico Dietrich
 #               Felix Endres
+#               mj0, 08-09-2006
 #
 # Copyright:    (c) 2003 - 2006 - RZ Universitaet Freiburg
 #               (c) 2006 - openslx.org project
@@ -224,35 +225,43 @@ goto_script_dir()
 }
 
 # add a bootsplash image to the initial ramdisk, only SuSE at the moment
-add_splash () {
+# theming
 
-splashsizes="$SPLASH"
-splashsizes="640*480 800x600 1024x768 1280x1024 1400x1050 1600x1200"
-splash_bin=$(chroot $ROOTDIR which splash)
+add_theme() {
+
+theme="${theme}"
+splashsizes="640x480 800x600 1024x768 1280x1024 1400x1050 1600x1200"
 splash_image=
-THEME="dxs"
+splash_bin=$(chroot $ROOTDIR which splash)
 if [ -n "$splashsizes" -a -n "$splash_bin" ]; then
 
   themes_dir=
-  if [ -d "$ROOTDIR/etc/bootsplash/themes" ]; then
-    themes_dir="/etc/bootsplash/themes"
-  elif [ -d "$ROOTDIR/usr/share/splash/themes" ]; then
-    themes_dir="/usr/share/splash/themes"
+  if [ -d "/usr/share/openslx/themes/${theme}/bootsplash" ]; then
+    themes_dir="/usr/share/openslx/themes/${theme}/bootsplash"
+  if [ -d "$ROOTDIR/etc/bootsplash/themes/${theme}" ]; then
+    themes_dir="/etc/bootsplash/themes/${theme}"
+  elif [ -d "$ROOTDIR/usr/share/splash/themes/${theme}" ]; then
+    themes_dir="/usr/share/splash/themes/${theme}"
   fi
 
+  #fixme: very ugly ;)
+  mkdir -p $ROOTDIR/tmp/bootsplash
+  cp -a $themes_dir/* $ROOTDIR/tmp/bootsplash/
+  themes_dir=$ROOTDIR/tmp/bootsplash
+  
   echo -ne "Bootsplash:\t"
   if [ -n "$ROOTDIR/$themes_dir" -a \
-     -d "$ROOTDIR/$themes_dir/$THEME" -o -L "$ROOTDIR/$themes_dir/$THEME" ]; then
+     -d "$ROOTDIR/$themes_dir" -o -L "$ROOTDIR/$themes_dir" ]; then
     for size in $splashsizes; do
-      bootsplash_picture="$themes_dir/$THEME/images/bootsplash-$size.jpg"
-      cfgname="$themes_dir/$THEME/config/bootsplash-$size.cfg"
+      bootsplash_picture="$themes_dir/images/bootsplash-$size.jpg"
+      cfgname="$themes_dir/config/bootsplash-$size.cfg"
       if [ ! -r $ROOTDIR/$cfgname ] ; then
-        echo "disabled for resolution $size"
+        echo " disabled for resolution $size "
       elif [ ! -r $ROOTDIR/$bootsplash_picture ] ; then
-        echo "no image for resolution $size"
+        echo " no image for resolution $size "
       else
         echo -n "${splash_image:+, }$THEME ($size)"
-        splash_image="$splash_image $cfgname"
+        splash_image=" $splash_image $cfgname "
       fi
     done
     echo
@@ -266,8 +275,14 @@ for image in $splash_image; do
   # fixme: ugly hack to have the splash binary
   chroot $ROOTDIR $splash_bin -s -f $image >> ${INSTDIR}/bootsplash
 done
+
+rm -rf $ROOTDIR/tmp/bootsplash
+
+# kdm/Xdialog theme
+cp -a ../theming/${theme}/* ${INSTDIR}/usr/share/themes
 }
 
+
 #########################################################################
 # End of function declaration
 
@@ -299,7 +314,7 @@ while getopts :bhgk:i:r:o:s:f:n:Sut:d:v:I:V:a: a ; do
     f)  FSMODULES=$OPTARG;;
     n)  NWMODULES=$OPTARG ;;
     r)  ROOTDIR=$OPTARG;;
-    s)  SPLASH=$OPTARG;;
+    s)  theme=$OPTARG;;
     t)  INSTDIR=$OPTARG;;
     d)  IRFSDEBUG=$OPTARG;;
     D)  DISTRO=$OPTARG;;
@@ -701,7 +716,7 @@ strip  ${INSTDIR}/bin/*  ${INSTDIR}/lib/* &>/dev/null
 #########################################################################
 # End of file copy procedures
 
-[ -n "$SPLASH" ] && add_splash
+[ -n "${theme}" ] && add_splash
 
 # finally create the compressed initial ramdisk cpio archive
 pushd . > /dev/null 2>&1