VMware environment: loopfile and mount will be placed in /etc/vmware

now to avoid problems with nfs and unionfs. Cleanups in vmware-prep
script. Introduced new debug level for script runtime calculation, see
DebugLevel for further information. Code cleanups in major initramfs
scripts, improved /tmp handling in hwautocfg and init ... Removed imgsrv
variable (from machine-setup), just merged with the vmware variable (put
the vmware image source here ...)


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

1 files changed, 35 insertions, 22 deletions

diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index d16f8d68..17ab8511 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -4,7 +4,7 @@
 # diskless clients (executed in stage3 within initial ramfs). The file-
 # system is setup when servconfig starts
 #
-# Dirk von Suchodoletz <dvs@OpenSLX.com>, 01-09-2006
+# Dirk von Suchodoletz <dvs@OpenSLX.com>, 03-09-2006
 # Michael Janczyk <mj0>, 31-05-2006
 # Lars Mueller <lm@OpenSLX.com>, 23-06-2006
 # Oliver Tappe <ot@OpenSLX.com>, 23-06-2006
@@ -25,8 +25,11 @@
 # get location of logfile definition
 . /mnt/etc/${D_SYSCONFDIR}/logfile
 
-# heavy debugging output in level 3 and above ...
-[ $DEBUGLEVEL -gt 3 -a $DEBUGLEVEL -lt 10 -o $DEBUGLEVEL -eq 12 ] && \
+# script run timer
+[ $DEBUGLEVEL -eq 8 ] && echo "** SW setup started at $(sysup)"
+
+# heavy debugging output in level 3 and below 8 ...
+[ $DEBUGLEVEL -gt 3 -a $DEBUGLEVEL -lt 8 -o $DEBUGLEVEL -eq 12 ] && \
   set -x
 
 #######################################################################
@@ -38,31 +41,13 @@ cp -a /etc/sysconfig/files/* /mnt 2>/dev/null &
   cat /etc/boot.local >> /mnt/etc/${D_BOOTLOCAL}
 }
 
-# set greeting and add information on booted system (distro)
-len=$(expr length $DISTRO)
-dstr="$DISTRO)"
-while [ $len -le 11 ] ; do
-  dstr="$dstr "
-  len=$(expr $len + 1)
-done
-echo "
-  WELCOME TO                                       \n (\l)
-       _____  ______  ______ __    __    _______ __     __    __
-      /  _   |   _   |   ___|  |  |  |  |   ____|  |   |  |  |  |
-     |  | |  |  |_|  |  |_  |   |    |  |  |___ |  |         /  /
-     |  | |  |   ___/|   _|      |   |   ____   |  |     |     |
-     |  |_|  |  |    |  |___|  |  |  |   ____|  |  |___ /  /
-       _____/|__|    |______|__|  |__|  |_______|______|__|  |__|
-
-  Diskless Workstation (v4.1/$dstr         (c) <OpenSLX.ORG>
-">/mnt/etc/issue
-
 #######################################################################
 # read and unify configuration options - default configuration file,
 # from dhcp, ldap ...
 # wait for the appearance of configuration from several sources
 cfgcomplete
 . /etc/machine-setup
+[ $DEBUGLEVEL -eq 8 ] && echo "** Config info is complete at $(sysup)"
 
 # copy additional configuration and var files and directories
 # admins can place there files in /var/lib/openslx/config/...
@@ -70,6 +55,30 @@ cfgcomplete
 # ... in the near future ...
 cp -a /rootfs/* /mnt 2>/dev/null
 
+# set greeting and add information on booted system (distro)
+len=$(expr length $DISTRO)
+dstr="$DISTRO)"
+while [ $len -le 16 ] ; do
+  dstr="$dstr "
+  len=$(expr $len + 1)
+done
+len=$(expr length $host_name)
+while [ $len -le 30 ] ; do
+  space="$space "
+  len=$(expr $len + 1)
+done
+echo "
+   WELCOME TO                 $space        \n (\l)
+           _____  ______  ______ __    __    _______ __     __    __
+          /  _   |   _   |   ___|  |  |  |  |   ____|  |   |  |  |  |
+         |  | |  |  |_|  |  |_  |   |    |  |  |___ |  |        /  /
+         |  | |  |   ___/|   _|      |   |   ____   |  |     |    |
+         |  |_|  |  |    |  |___|  |  |  |   ____|  |  |___ /  /
+           _____/|__|    |______|__|  |__|  |_______|______|__|  |__|
+
+   Diskless Workstation (v4.1/$dstr   (c) <OpenSLX.ORG project>
+">/mnt/etc/issue
+
 #######################################################################
 # vmware stuff first part: two scenarios
 # * VM images in /usr/share/vmware - then simply link
@@ -332,6 +341,7 @@ fi
 # there might be the chance that we have a disk partition available, so
 # wait for completion of detection, setup process
 waitfor /tmp/tmpready 10000
+[ $DEBUGLEVEL -eq 8 ] && echo "** Setup of /tmp completed at $(sysup)"
 # create some directories and correct permissions
 tmpisdisk=$(sed -n '/\/tmp/p' /tmp/fstab 2>/dev/null)
 # if there is no local disk partition for /tmp then try to mount a rw
@@ -487,5 +497,8 @@ DisplayManager.*.reset:\t\t/etc/X11/xdm/Xreset" \
   esac
 fi
 
+# script run timer
+[ $DEBUGLEVEL -eq 8 ] && echo "** SW setup finished at $(sysup)"
+
 # servconfig finished successfully
 echo "finished" > /tmp/svcfg