Cleanups, small bugfixes, ...

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

1 files changed, 19 insertions, 26 deletions

diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index 8c7e05c3..7ac87bb6 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -45,14 +45,15 @@ while [ $len -le 11 ] ; do
   len=$(expr $len + 1)
 done
 echo "
-         WELCOME TO                               \n (\l)
-                  _____    ______     __       _____
-                 /  _     |   _      |  |     |   _  |
-                |  | |  | |  | |  |  |  |     |  |_| |
-                |  |_|  | |  |_|  |  |  |___  |   ___/
-                  _____/  |______/   |______| |__|
-
-         Diskless Workstation (v4.1/$dstr (c) <OpenSLX.ORG>
+  WELCOME TO                                    \n (\l)
+       _____  ______  ______ __    __    _______ __    __    __
+      /  _   |   _   |   ___|  |  |  |  |   ____|  |  |  |  |  |
+     |  | |  |  |_|  |  |_  |   |    |  |  |___ |  |        /  /
+     |  | |  |   ___/|   _|      |   |   ____   |  |    |     |
+     |  |_|  |  |    |  |___|  |  |  |   ____|  |  |__ /  /
+       _____/|__|    |______|__|  |__|  |_______|_____|__|  |__|
+
+  Diskless Workstation (v4.1/$dstr      (c) <OpenSLX.ORG>
 ">/mnt/etc/issue
 
 #######################################################################
@@ -221,11 +222,11 @@ config_bt
 # network(ed) services
 
 # network time service (ntp) configuration file
-if [ -n "$ntp_servers" ]; then
+if [ -n "$ntp_servers" -a ! -f /rootfs/etc/ntp.conf ]; then
   echo -e "# /etc/ntp.conf - file generated by $0: \
-$date\n" >/mnt/etc/ntp.conf;
+$date\n" >/mnt/etc/ntp.conf
   for ntpserver in $ntp_servers; do
-    echo server $ntpserver >>/mnt/etc/ntp.conf;
+    echo server $ntpserver >>/mnt/etc/ntp.conf
   done
 fi
 # copy timezone file defined with language settings
@@ -268,14 +269,6 @@ if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then
            /var/run/vmware /etc/X11/sessions ; do
     testmkd /mnt/$i
   done
-  # moved up within this file!!
-  # mount the vmware image source or link it (compatibility to ver. 3)
-  #if [ -d /mnt/usr/share/vmware ] ; then
-  #  ln -sf /usr/share/vmware /var/lib/vmware
-  #elif [ -n "${imgsrv}" ] ; then
-  #  # more general mount script should be used here!?
-  #  ( nfsmnt ${imgsrv} /mnt/var/lib/vmware || error "$scfg_nfs" nonfatal ) #&
-  #fi
   # generate a runlevel script
   d_mkrlscript init vmware-prep "Starting preparation of vmware environment"
   sed "s,^#.*,,;/^$/d;s,^,        ," /etc/vmware-prep >> \
@@ -289,10 +282,10 @@ if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then
     # add special sessions to the display managers session menu
     # check here that mount finished and the important files are available
     # default kdm session. Xdialog with WM and VMware images
-    cp /mnt/var/lib/vmware/templ/runvmware /mnt/var/X11R6/bin
-    chmod 755 /mnt/var/X11R6/bin/runvmware >/dev/null 2>&1
-    cp /mnt/var/lib/vmware/templ/defaultwm /mnt/var/X11R6/bin
-    chmod 755 /mnt/var/X11R6/bin/defaultwm >/dev/null 2>&1
+    cp /mnt/var/lib/vmware/templ/runvmware \
+      /mnt/var/X11R6/bin >/dev/null 2>&1
+    cp /mnt/var/lib/vmware/templ/defaultwm \
+      /mnt/var/X11R6/bin >/dev/null 2>&1
   fi
   config_vmware
   chmod 1777 /mnt/var/run/vmware
@@ -309,7 +302,8 @@ Type=Application" >/mnt/etc/X11/sessions/default.desktop
     \nxterm -bg black -fg white -geometry 100x30+0-0 +sb \
     -e \"/var/X11R6/bin/runvmware -s \${startvm}\"\n" \
     > /mnt/var/X11R6/bin/desktop-session #${debug} removed
-  chmod 755 /mnt/var/X11R6/bin/desktop-session
+  chmod 755 /mnt/var/X11R6/bin/runvmware /mnt/var/X11R6/bin/defaultwm \
+    /mnt/var/X11R6/bin/desktop-session >/dev/null 2>&1
   sessions=$(ls /mnt/var/lib/vmware/vmsessions/*.desktop 2>/dev/null)
   # fixme: the following part is to be tested!!
   if [ -n "${sessions}" ]; then
@@ -370,8 +364,7 @@ if [ "x$start_x" != "xno" ] ; then
            /var/run/xdmctl \
            /tmp/.ICE-unix \
            /tmp/.X11-unix ; do testmkd /mnt/$i; done
-  chmod a+rwxt /mnt/tmp/.ICE-unix
-  chmod a+rwxt /mnt/tmp/.X11-unix
+  chmod a+rwxt /mnt/tmp/.ICE-unix /mnt/tmp/.X11-unix
   echo "# file emtied by $0 during initramfs" > /mnt/etc/X11/xdm/Xservers
   # define additional sessions offered to the user (via dhcp/ldap config)
   # descsession -> deprecated by new vmware integration concept