From 42afca10fa4df79e7dfd7ddfe4df21df82ac159c Mon Sep 17 00:00:00 2001 From: Dirk von Suchodoletz Date: Sun, 3 Sep 2006 13:59:27 +0000 Subject: 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 --- initrd/initrd-stuff/bin/dhcpmkconfig | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'initrd/initrd-stuff/bin/dhcpmkconfig') diff --git a/initrd/initrd-stuff/bin/dhcpmkconfig b/initrd/initrd-stuff/bin/dhcpmkconfig index b2ef4e3a..ded4caaa 100755 --- a/initrd/initrd-stuff/bin/dhcpmkconfig +++ b/initrd/initrd-stuff/bin/dhcpmkconfig @@ -1,14 +1,14 @@ #!/bin/sh # -# Description: universal (distro independent) IP configuration writer for -# several dhcp clients. The result is written in unified form -# to the /etc/machine-setup file +# universal (distro independent) IP configuration writer for several dhcp +# clients used within OpenSLX initramfs. The result is written in unified +# form to the /etc/machine-setup file # -# Author(s): Dirk von Suchodoletz , 09-07-2006 -# Lars Mueller, 23-06-2006 -# Oliver Tappe, 23-06-2006 +# Dirk von Suchodoletz , 03-09-2006 +# Lars Mueller, 23-06-2006 +# Oliver Tappe, 23-06-2006 # -# Copyright: (c) 2006 - RZ Universitaet Freiburg +# (c) 2006 - RZ Universitaet Freiburg # client variable should be exported via calling function cfgfile="/tmp/confviadhcp" @@ -20,7 +20,7 @@ enabled\n# via kernel command line)." # heavy debugging output in level 3 and above ... and on 13 #FIXME: DEBUGLEVEL is not propagated to this file (at least for Ubuntu) [ -z "$DEBUGLEVEL" ] && DEBUGLEVEL=0 -[ $DEBUGLEVEL -gt 3 -a $DEBUGLEVEL -lt 10 -o $DEBUGLEVEL -eq 13 ] && \ +[ $DEBUGLEVEL -gt 3 -a $DEBUGLEVEL -lt 8 -o $DEBUGLEVEL -eq 13 ] && \ set -x case $0 in *dhcpcd*) -- cgit v1.2.3-55-g7522