From 2ad560f708aef40729ec58cdc0d751f43594a98e Mon Sep 17 00:00:00 2001 From: Dirk von Suchodoletz Date: Tue, 11 Apr 2006 22:19:48 +0000 Subject: simplifications for union mounts in init (but problems still exist), message output for nfs mounts changed ... git-svn-id: http://svn.openslx.org/svn/openslx/ld4@181 95ad53e4-c205-0410-b2fa-d234c58c8868 --- initrd/initrd-stuff/bin/servconfig | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'initrd/initrd-stuff/bin/servconfig') diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig index 13cdc25a..13a8b4b4 100755 --- a/initrd/initrd-stuff/bin/servconfig +++ b/initrd/initrd-stuff/bin/servconfig @@ -4,15 +4,17 @@ # for linux diskless clients (executed within initial # ramdisk) # -# Author(s): Dirk von Suchodoletz , 09-04-2006 +# Author(s): Dirk von Suchodoletz , 11-04-2006 # # Copyright: (c) 2006 - RZ Universitaet Freiburg # -# Version: 0.0.2e +# Version: 0.1.0a # check for configuration files to source -# functions common for all distros +# functions common for all distros, messages contains all error and info +# output +. /etc/messages . /etc/functions # load distro specific configuration variables and functions. distro # specific functions may overwrite functions defined in /etc/functions @@ -229,7 +231,7 @@ if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then ln -sf /usr/share/vmware /var/lib/vmware elif [ -n "${imgsrv}" ] ; then # nfsmnt script should be used here ... - nfsmnt ${imgsrv} /mnt/var/lib/vmware & + ( nfsmnt ${imgsrv} /mnt/var/lib/vmware || error "$scfg_nfs" nonfatal ) & #mount -n -t nfs -o ro,nolock,intr,nodev,soft,timeo=2,nosuid \ # ${imgsrv} fi -- cgit v1.2.3-55-g7522