fix for debuglevel in ld4-inst, kdmrc in functions-9.3, ...

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

3 files changed, 57 insertions, 20 deletions

diff --git a/initrd/distro-specs/suse/functions-9.3 b/initrd/distro-specs/suse/functions-9.3
index 1fd2ab6d..43139284 100644
--- a/initrd/distro-specs/suse/functions-9.3
+++ b/initrd/distro-specs/suse/functions-9.3
@@ -4,11 +4,11 @@
 #		functions file). This file is the main base for the 
 #		following SuSE distributions
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 30-04-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 10-05-2006
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 # 
-# Version:      0.2.2e
+# Version:      0.2.2f
 
 # distro specific stuff to initialize
 preinit () {
@@ -299,6 +299,52 @@ fi
 # configure kdm as display manager
 config_kdm () {
 config_dm_entry yes
+echo -e "# /etc/opt/kde3/share/config/kdm/kdmrc - \
+file generated by\n\
+#\t$0: $date\n\
+[General]\n\
+ConfigVersion=2.3\nStaticServers=:0\nExportList=LANG\n\
+PidFile=/var/run/kdm.pid\nAuthDir=/var/lib/xdm/authdir/authfiles/\n\
+ServerVTs=-7\nConsoleTTYs=tty1,tty2,tty3,tty4,tty5,tty6\n\n\
+[Xdmcp]\n\
+Enable=$xdmcp\nXaccess=/etc/X11/xdm/Xaccess\n\
+Willing=/etc/X11/xdm/Xwilling\n[Shutdown]\nHaltCmd=/sbin/halt\n\
+RebootCmd=/sbin/reboot\n\n\
+[X-*-Core]\n\
+ServerCmd=/usr/X11R6/bin/X -br\n\
+ServerArgsLocal=-nolisten tcp\n\
+TerminateServer=true\n\
+Resources=/etc/X11/xdm/Xresources\nSetup=/etc/X11/xdm/Xsetup\n\
+Startup=/etc/X11/xdm/Xstartup\nReset=/etc/X11/xdm/Xreset\n\
+Session=/etc/X11/xdm/Xsession\nClientLogFile=.xsession-errors-%s\n\
+AutoReLogin=false\nAllowRootLogin=true\n\
+AllowNullPasswd=true\nAllowShutdown=All\n\
+SessionsDirs=/etc/X11/sessions,/usr/share/xsessions,\
+/opt/kde3/share/apps/kdm/sessions\n\
+AuthNames=XDM-AUTHORIZATION-1,MIT-MAGIC-COOKIE-1\n\n\
+[X-*-Greeter]\n\
+ShowUsers=Selected\nSelectedUsers=\nUserList=false\n\
+GUIStyle=default\nLogoArea=Clock\nGreetString=Diskless Linux (%h)\n\
+GreetFont=Nimbus Sans l,20,-1,5,48,0,0,0,0,0\n\
+StdFont=Nimbus Sans l,14,-1,5,48,0,0,0,0,0\n\
+FailFont=Nimbus Sans l,14,-1,5,74,0,0,0,0,0\n\
+AntiAliasing=true\nLanguage=$lang\n\
+EchoMode=OneStar\nShowLog=false\n\
+UseTheme=true\nTheme=/opt/kde3/share/apps/kdm/themes/SUSE\n\
+UseBackground=false\n\
+BackgroundCfg=/etc/opt/kde3/share/config/kdm/backgroundrc\n\n\
+[X-:*-Greeter]\n\
+PreselectUser=None\n\
+FocusPasswd=true\nLoginMode=DefaultLocal\n\
+AllowClose=false\nUseAdminSession=true\n\n\
+[X-:0-Core]\n\
+AutoLoginEnable=false\n\
+ClientLogFile=.xsession-errors\n\
+NoPassEnable=false\n\n\
+[X-:0-Greeter]\n\
+LogSource=/dev/xconsole\n\
+UseAdminSession=false" >/mnt/etc/opt/kde3/share/config/kdm/kdmrc
+echo -e "" > /mnt/etc/opt/kde3/share/config/kdm/backgroundrc
 }
 
 # configure bluetooth services
diff --git a/initrd/initrd-stuff/etc/vmware-prep b/initrd/initrd-stuff/etc/vmware-prep
index d3a377ee..effcb056 100644
--- a/initrd/initrd-stuff/etc/vmware-prep
+++ b/initrd/initrd-stuff/etc/vmware-prep
@@ -6,10 +6,10 @@
 #		initial ramdisk
 #
 # Author(s):    Michael Janczyk <mj0@uni-freiburg.de>, 04-04-2006
-#               Dirk von Suchodoletz <dirk@goe.net>, 28-04-2006
+#               Dirk von Suchodoletz <dirk@goe.net>, 10-05-2006
 # Copyright:    (c) 2003, 2006 - RZ Universitaet Freiburg
 #
-# Version:      0.2a
+# Version:      0.2b
 ################################################################################
 
 
@@ -101,19 +101,6 @@ vmsession2desktop_session () {
   fi
 }
 
-# no-usb-rule as udev vmware rule
-vm_udev () {
-echo -e "#!/bin/sh\n# script for blocking linux usb action during vmware \
-sessions\n# written from $0 script during runlevel\n# add any usb modules \
-here, which you would like to disable in linux for \n# getting them in \ 
-vmware guest os\n# Dirk von Suchodoletz <dirk@goe.net>\nRETURN=1\n\
-ps aux |grep -i vmware| grep -v "grep" &>/dev/null && {\n  RET=0\n  \
-rmmod usb-storage & >/dev/null\n}\nexit $RET" > /var/X11R6/bin/vm-udev
-chmod u+x /var/X11R6/bin/vm-udev
-echo -e '# special rule for ignoring usb events during vmware sessions\n\
-BUS=="usb", ACTION=="add", PROGRAM="/var/X11R6/bin/vm-udev", \
-OPTIONS="ignore_device"' > /etc/udev/rules/01-udev-vm.rules
-}
 
 ### START SCRIPT ###############################################################
 
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index fabda00f..874792f7 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -2,7 +2,7 @@
 # Description:  main script for new type of initial ramdisk for
 #		linux diskless clients version 4 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 01-05-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 10-05-2006
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 # 
@@ -425,8 +425,12 @@ proc\t\t/proc\t\tproc\t\tdefaults\t 0 0\ninitramdevs\t/dev\t\ttmpfs\
 \t\trw\t\t 0 0\ndevpts\t\t/dev/pts\tdevpts\t\tmode=0620,gid=5\t 0 0\n\
 usbfs\t\t/proc/bus/usb\tusbfs\t\tnoauto\t\t 0 0" >>/mnt/etc/fstab || \
   error "$init_fstab"
-echo -e "rootfs / rootfs rw 0 0" > /mnt/etc/mtab
-
+echo -e "rootfs / rootfs rw 0 0\ninitramdevs /dev tmpfs rw\
+ 0 0" > /mnt/etc/mtab
+[ -z "$UNIONFS" ] && echo -e "ramfs /tmp tmpfs rw 0 0\nramfs /root\
+tmpfs rw 0 0\nramfs /media tmpfs rw 0 0 \nramfs /home tmpfs rw 0 0" \
+ > /mnt/etc/mtab
+ 
 # copy library cache if generated
 if [ -z "${NOLDSC}" ] ; then
   if waitfor /tmp/ldcfg 50000 ; then