runvmware xdialog write to stdout. kdmrc template established +

adaptations for new kdmrc template.



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

5 files changed, 139 insertions, 34 deletions

diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index 13eb7f14..21d8c2e3 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -4,6 +4,7 @@
 # Dirk von Suchodoletz <dirk@goe.net>, 23-06-2006
 # Nico Dietrich
 # Felix Endres
+# mj0, 12-12-2006
 #
 # (c) 2006 - RZ Universitaet Freiburg
 # (c) 2006 - OpenSLX.ORG project
@@ -331,6 +332,10 @@ fi
 
 # configure kdm as display manager
 config_kdm () {
+# first define directories for kdm
+kdmrcdir=/etc/kde3/kdm
+xdmdir=/etc/kde3/kdm
+
 # fixme: check if a kdmrc was provided via ConfTGZ
 #[ -f /rootfs/etc/opt/???? kdmrc ] || \
 # echo " ..." > kdmrc
@@ -345,6 +350,9 @@ config_kdm () {
 #    \t( sleep 120; ln -sf /etc/${D_INITDIR}/kdm /etc/rc3.d/S01kdm \
 #    >${LOGFILE} 2>&1) &\n" >>/mnt/etc/${D_INITDIR}/boot.ld
 #fi
+
+# write configuration file
+config_kdm_template
 }
 
 # configure hal, dbus, resmgr and services like that
@@ -387,7 +395,12 @@ rllinker "vmware-prep" "18" "02"
 rllinker "vmware" "20" "02"
 # during vmware sessions linux should not handle usb events/devices
 testmkd /mnt/var/X11R6/bin
+# add special path /var/X11R6/bin to the PATH variable
+# fixme!! add path directly to /etc/profile!?
+echo -e "# added path component by $0: $date\n\
+PATH=\"\$PATH:/var/X11R6/bin\"" >>/mnt/etc/profile
 echo '#!/bin/sh'>> /mnt/etc/udev/rules.d/01-udev-vm.rules
+# USB stuff
 echo -e "# Script for blocking linux from handling usb \
 devices\n# during vmware sessions. If you like to remove certain modules \
 add them\n# to the list below - Dirk von Suchodoletz, <dirk@goe.net>\n\
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index ac17578a..e78bf88c 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -4,7 +4,7 @@
 #
 # Dirk von Suchodoletz <dvs@OpenSLX.com>, 19-11-2006
 # Felix Endres, 30-04-2006
-# <mj0@uni-freiburg.de> (xenbr), 27-09-2006
+# <mj0@uni-freiburg.de> (xenbr), 12-12-2006
 # Tobias Maier
 #
 # (c) 2006 - RZ Universitaet Freiburg
@@ -906,6 +906,102 @@ for i in boot.ld ${D_INITSCRIPTS}; do
 done
 }
 
+# kdmrc template
+config_kdm_template () {
+usetheme=false
+themeconf=$(ls /mnt/var/lib/openslx/themes/displaymanager/*.xml 2>/dev/null)
+[ -r "${themeconf}" ] && usetheme=true
+# check if a kdmrc was provided via ConfTGZ
+[ -f /rootfs/${kdmrcdir}/kdmrc ] || \
+  echo -e "# ${kdmrcdir}/kdmrc - \
+file generated by
+#\t$0: $date\n\
+[General]
+ConfigVersion=2.3
+StaticServers=:0
+ExportList=LANG
+PidFile=/var/run/kdm.pid
+AuthDir=/var/lib/xdm/authdir/authfiles
+ServerVTs=-7
+ConsoleTTYs=tty1,tty2,tty3,tty4,tty5,tty6
+[Xdmcp]
+Enable=$xdmcp
+Xaccess=/${xdmdir}/Xaccess
+Willing=/${xdmdir}/Xwilling
+[Shutdown]
+HaltCmd=/sbin/halt
+RebootCmd=/sbin/reboot
+[X-*-Core]
+ServerCmd=/usr/X11R6/bin/X -br
+ServerArgsLocal=-nolisten tcp
+TerminateServer=true
+Resources=/${xdmdir}/Xresources
+Setup=/${xdmdir}/Xsetup
+UserPath=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/var/X11R6/bin
+SystemPath=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:\
+/usr/X11R6/bin:/var/X11R6/bin
+Startup=/${xdmdir}/Xstartup
+Reset=/${xdmdir}/Xreset
+Session=/${xdmdir}/Xsession
+ClientLogFile=.xsession-errors-%s
+AutoReLogin=false
+AllowRootLogin=true
+AllowNullPasswd=true
+AllowShutdown=All
+SessionsDirs=/etc/X11/sessions,/usr/share/xsessions
+AuthNames=XDM-AUTHORIZATION-1,MIT-MAGIC-COOKIE-1
+[X-*-Greeter]
+ShowUsers=Selected
+SelectedUsers=
+UserList=false
+GUIStyle=default
+LogoArea=Clock
+GreetString=Diskless Linux (%h)
+GreetFont=Nimbus Sans l,20,-1,5,48,0,0,0,0,0
+StdFont=Nimbus Sans l,14,-1,5,48,0,0,0,0,0
+FailFont=Nimbus Sans l,14,-1,5,74,0,0,0,0,0
+AntiAliasing=true
+Language=$lang
+EchoMode=OneStar
+ShowLog=false
+UseTheme=${usetheme}
+Theme=/var/lib/openslx/themes/displaymanager
+UseBackground=true
+BackgroundCfg=/var/lib/openslx/themes/displaymanager/backgroundrc
+[X-:*-Greeter]
+PreselectUser=None
+FocusPasswd=true
+LoginMode=DefaultLocal
+AllowClose=false
+UseAdminSession=true
+[X-:0-Core]
+AutoLoginEnable=false
+ClientLogFile=.xsession-errors
+NoPassEnable=false
+[X-:0-Greeter]
+LogSource=/dev/xconsole
+UseAdminSession=false" >/mnt/${kdmrcdir}/kdmrc
+echo -e "[Desktop0]
+BackgroundMode=Flat
+BlendBalance=100
+BlendMode=NoBlending
+ChangeInterval=60
+Color1=0,51,102
+Color2=255,255,255
+CurrentWallpaper=0
+LastChange=0
+MinOptimizationDepth=1
+MultiWallpaperMode=NoMulti
+Pattern=triangles
+Program=
+ReverseBlending=false
+UseSHM=false
+Wallpaper=
+WallpaperList=
+WallpaperMode=NoWallpaper" \
+  >/mnt/var/lib/openslx/themes/displaymanager/backgroundrc
+}
+
 #############################################################################
 # dummy functions - avoid undefined functions in servconfig (functions are
 # normally overwritten by settings within distro-functions - a file generated
@@ -971,6 +1067,11 @@ config_xdm () {
 :
 }
 
+# configure kdm as display manager
+config_kdm () {
+:
+}
+
 # configure gdm as display manager
 config_gdm () {
 :
diff --git a/initramfs/mkdxsinitrd b/initramfs/mkdxsinitrd
index 089e8d47..1e3e1c17 100755
--- a/initramfs/mkdxsinitrd
+++ b/initramfs/mkdxsinitrd
@@ -7,7 +7,7 @@
 # Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 02-12-2006
 #               Nico Dietrich
 #               Felix Endres
-#               <mj0@uni-freiburg.de> (xenbr), 27-09-2006
+#               <mj0@uni-freiburg.de> (xenbr), 12-12-2006
 #
 # Copyright:    (c) 2003 - 2006 - RZ Universitaet Freiburg
 #               (c) 2006 - openslx.org project
@@ -263,31 +263,29 @@ goto_script_dir()
 
 # add a bootsplash image to the initial ramdisk, only SuSE at the moment
 # theming
-
 add_theme() {
 
 theme="${theme}"
 splashsizes="640x480 800x600 1024x768 1280x1024 1400x1050 1600x1200"
 splash_image=
 splash_bin=$(chroot $ROOTDIR which splash)
-if [ -n "$splashsizes" -a -n "$splash_bin" ]; then
-
-  themes_dir="${SLX_SHARE_PATH}/themes/openslx/bootsplash"
-  if [ -d "${SLX_SHARE_PATH}/themes/${theme}/bootsplash" ]; then
-    themes_dir="${SLX_SHARE_PATH}/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
-    themes_dir="/usr/share/splash/themes/${theme}"
-  fi
+themes_dir="${SLX_SHARE_PATH}/themes/openslx/bootsplash"
+if [ -d "${SLX_SHARE_PATH}/themes/${theme}/bootsplash" ]; then
+  themes_dir="${SLX_SHARE_PATH}/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
+  themes_dir="/usr/share/splash/themes/${theme}"
+fi
 
-  #fixme: very ugly ;)
-  mkdir -p $ROOTDIR/tmp/bootsplash
-  cp -a $themes_dir/* $ROOTDIR/tmp/bootsplash
-  themes=${themes_dir%bootsplash}
-  echo -e "\n\tUsing ${themes} for themes.\n"
-  themes_dir=$ROOTDIR/tmp/bootsplash
+#fixme: very ugly ;)
+mkdir -p $ROOTDIR/tmp/bootsplash
+cp -a $themes_dir/* $ROOTDIR/tmp/bootsplash
+themes=${themes_dir%bootsplash}
+echo -e "\n\tUsing ${themes} for themes.\n"
+themes_dir=$ROOTDIR/tmp/bootsplash
 
+if [ -n "$splashsizes" -a -n "$splash_bin" ]; then
   if [ -n "$themes_dir" -a \
      -d "$themes_dir" -o -L "$themes_dir" ]; then
     for size in $splashsizes; do
@@ -315,7 +313,6 @@ for image in $splash_image; do
 done
 
 rm -rf $ROOTDIR/tmp/bootsplash
-
 # kdm/Xdialog theme
 cp -a ${themes}* ${INSTDIR}/usr/share/themes
 }
diff --git a/theming/openslx/displaymanager/industrial.xml b/theming/openslx/displaymanager/industrial.xml
index d5c67c8e..fcc28816 100644
--- a/theming/openslx/displaymanager/industrial.xml
+++ b/theming/openslx/displaymanager/industrial.xml
@@ -92,11 +92,6 @@
               <item type="rect" id="plugin-specific-winbind">
                 <pos anchor="nw" x="100%" width="250"/>
                 <fixed>
-                  <item type="label" id="domain-label">
-                    <pos anchor="nw" x="0"/>
-                    <normal color="#ffffff" font="Sans 12"/>
-                    <stock type="domain-label"/>
-                  </item>
                   <item type="entry" id="domain-entry">
                     <pos anchor="nw" x="3%" y="30" height="24" width="100%"/>
                   </item>
diff --git a/vmware/runvmware b/vmware/runvmware
index 41a67037..bda1ed11 100755
--- a/vmware/runvmware
+++ b/vmware/runvmware
@@ -4,10 +4,10 @@
 #               X Stations and interactive session chooser (v4)
 #
 # Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 18-03-2006
-#               Michael Janczyk <mj0@uni-freiburg.de>, 10-11-2006
+#               Michael Janczyk <mj0@uni-freiburg.de>, 12-12-2006
 # Copyright:    (c) 2003, 2006 - RZ Universitaet Freiburg
 #
-# Version:      0.16.507
+# Version:      0.16.531
 #
 ################################################################################
 
@@ -179,7 +179,7 @@ cdr_2_name="/dev/cdrom1"
 floppya="FALSE"
 floppyb="FALSE"
 # place for the virtual floppy "B:"
-floppybname="/etc/vmware/loopimg/fd.img"
+floppybname="/etc/vmware/loopimg/fd1.img"
 # resolution
 hostres=$(xvidtune -show 2>/dev/null| grep -ve "^$")
 xres=$(echo "${hostres}" | awk '{print $3}')
@@ -401,18 +401,17 @@ x_dialog ()
     exit 1
   fi
 
-  # --stderr because of 1>/dev/null
   # echoing to file because Xdialog sux when used w/ quotes
   echo -e "Xdialog ${dialogtitle} \
           --screen-center \
           --fill \
           --no-wrap \
-          --stderr \
+          --stdout \
           --no-tags \
           --ok-label \"START\" \
           --item-help \
           --menubox \"Please choose the image you would like to run:\" 35 80 0 \
-          $menu 1>/dev/null" \
+          $menu 2>/dev/null" \
   > ${tmpdir}/Xdialog
   
 . ${tmpdir}/Xdialog
@@ -605,7 +604,7 @@ mkdir -p ${vmhome} >/dev/null 2>&1
 if [ "${xdm}" = "all" -o "${xdm}" = "vm" ]; then
   x_dialog_check
   xdm_mode
-  args_dial=$(x_dialog 2>&1) # 2>&1, see function
+  args_dial=$(x_dialog)
   exec ${args_dial}
   exit 0
 elif [ -n "${xdmstart}" -a -z "${xdm}" ]; then
@@ -740,7 +739,7 @@ if [ -n "${istart}" ]; then
   x_dialog_check
 
   # create menu, etc...
-  startvm=$(x_dialog 2>&1) # 2>&1, see function
+  startvm=$(x_dialog)
 
   if [ -z "${startvm}" ]; then
     writelog "\rNo image selected, please retry or use option -s\n" 0 0
@@ -772,7 +771,7 @@ fi
 
 # define name for VMware window
 displayname=$(grep -m 1 -i "name" \
-  ${vmsessions}/${startvm}.desktop | awk -F "=" '{print $2}')
+  ${vmsessions}/*${startvm}.desktop | awk -F "=" '{print $2}')
 # if variable not set
 displayname=${displayname:-"VMware Image"}