fix for the kiosk mode (permissions), fix for usb/vmware ...

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

1 files changed, 11 insertions, 10 deletions

diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index 2958f309..e0875798 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -5,10 +5,11 @@
 #		ramdisk) 
 #
 # Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 24-05-2006
+#		Michael Janczyk, 24-05-2006
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 # 
-# Version:      0.1.1c
+# Version:      0.1.1d
 
 # check for configuration files to source
 
@@ -244,13 +245,13 @@ fi
 cp /mnt/usr/share/zoneinfo/${TZ} /mnt/etc/localtime 2>/dev/null || \
   error "  No such timezone data file (needed for ntp time service \
 configuration)." nonfatal
-config_ntp 07 14
+config_ntp
 
 # secure shell server
-config_sshd 12 10
+config_sshd
 
 # simple network management protocol agent
-config_snmp 24 02
+config_snmp
 
 #######################################################################
 # vmware stuff: two scenarios
@@ -261,7 +262,7 @@ config_snmp 24 02
 if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then
   # in the future other types of sources besides NFS should be supported
   for i in /var/lib/vmware /etc/vmware/vmnet1 /etc/vmware/vmnet8 \
-           /var/run/vmware ; do
+           /var/run/vmware /mnt/etc/X11/sessions ; do
     testmkd /mnt/$i
   done
   # mount the vmware image source or link it (compatibility to ver. 3)
@@ -289,7 +290,7 @@ if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then
   Name[de]=Standard
   Exec=defaultwm
   TryExec=/usr/X11R6/bin/defaultwm
-  Type=Application' >/etc/X11/sessions/default.desktop
+  Type=Application' >/mnt/etc/X11/sessions/default.desktop
 fi
 
 #######################################################################
@@ -300,7 +301,7 @@ if [ "x$nis_domain" != "x" ] && [ "x$nis_servers" != "x" ] ; then
   echo -e "# /etc/yp.conf - file generated by $0:\n#\t\
 $date\n\nypserver "$nis_servers >/mnt/etc/yp.conf
   # should be last in passwd file
-  strinfile "+::::::" /mnt/etc/passwd||echo "+::::::" >>/mnt/etc/passwd
+  strinfile "+:::" /mnt/etc/passwd||echo "+::::::" >>/mnt/etc/passwd
   config_nis
 fi
 
@@ -392,9 +393,9 @@ resmgr login nobody tty7\nresmgr grant nobody desktop\nchown nobody \
 $start_x -- vt7 -quiet' -l nobody &>/dev/null\nrm /tmp/kiosk\n\
 resmgr revoke nobody\nresmgr logout tty7\nkillall X\nsleep 2" \
         >/mnt/var/X11R6/bin/kiosk
-      # early start      
-      echo -e "\t# kiosk start added by $0\n\tsleep 4; \
-/var/X11R6/bin/kiosk &>/dev/null &" >>/mnt/etc/${D_INITDIR}/boot.ld
+      # early start of kiosk session
+      echo -e "\t# kiosk start added by $0\n\t( touch /tmp/kiosk; sleep 2; \
+/var/X11R6/bin/kiosk &>/dev/null ) &" >>/mnt/etc/${D_INITDIR}/boot.ld
       cp /etc/startgui /mnt/var/X11R6/bin
       chmod a+x /mnt/var/X11R6/bin/kiosk /mnt/var/X11R6/bin/startgui
       rm /mnt/tmp/kiosk 2>/dev/null