diff options
| author | Dirk von Suchodoletz | 2006-06-26 10:40:07 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-06-26 10:40:07 +0200 |
| commit | c3443dcaeb85cf64987089607dc5a89517ceb74f (patch) | |
| tree | 540e7aa9b8606983990f4171aefeb00efe053dbd /initrd/initrd-stuff/bin | |
| parent | Added descriptions, some cleanups, ... (diff) | |
| download | core-c3443dcaeb85cf64987089607dc5a89517ceb74f.tar.gz core-c3443dcaeb85cf64987089607dc5a89517ceb74f.tar.xz core-c3443dcaeb85cf64987089607dc5a89517ceb74f.zip | |
Should fix a timing issue, which prevented hwautocfg to see the
completed machine-setup ...
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@251 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff/bin')
| -rwxr-xr-x | initrd/initrd-stuff/bin/hwautocfg | 8 | ||||
| -rwxr-xr-x | initrd/initrd-stuff/bin/servconfig | 15 |
2 files changed, 7 insertions, 16 deletions
diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg index 459a4174..0dd99e8a 100755 --- a/initrd/initrd-stuff/bin/hwautocfg +++ b/initrd/initrd-stuff/bin/hwautocfg @@ -4,10 +4,11 @@ # script for linux diskless clients, using hwconfig from # knoppix as base tool # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 01-05-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 26-06-2006 # Felix Endres # # Copyright: (c) 2003 - 2006 - RZ Universitaet Freiburg +# (c) 2006 - odlx.org project # # Version: 0.3.2b @@ -399,10 +400,7 @@ fi # configure some variables from configuration file - wait for dhcp or ldap # confiurator to complete -waitfor /tmp/dhcp-done 10000 || error " Did not get any configuration \ -data via dhcp until now ..." nonfatal -waitfor /tmp/ldap-done 10000 || error " Did not get any configuration \ -data via ldap until now ..." nonfatal +cfgcomplete . /etc/machine-setup # postpone some commands into normal bootup environment diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig index 5dc1f3ff..d5580267 100755 --- a/initrd/initrd-stuff/bin/servconfig +++ b/initrd/initrd-stuff/bin/servconfig @@ -4,7 +4,7 @@ # for linux diskless clients (executed within initial # ramdisk) # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 23-06-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 26-06-2006 # Michael Janczyk, 31-05-2006 # Lars Mueller, 23-06-2006 # Oliver Tappe, 23-06-2006 @@ -60,17 +60,10 @@ echo " ####################################################################### # read and unify configuration options - default configuration file, # from dhcp, ldap ... -# wait for the appearance of configuration via dhcp -# do not wait if dhcp is not used (how?) -waitfor /tmp/dhcp-done 10000 || error "$scfg_errdcfg" nonfatal -waitfor /tmp/file-done 10000 || error "$scfg_errfcfg" nonfatal -waitfor /tmp/ldap-done 10000 || error "$scfg_errlcfg" nonfatal -# concat the different files now into the central config file, order -# matters - ldap data has highest priority -for config in /tmp/confviadhcp /tmp/confviafile /tmp/confvialdap - do test -f $config && cat $config >> /etc/machine-setup -done +# wait for the appearance of configuration from several sources +cfgcomplete . /etc/machine-setup + # hack for replacing variables ($serverip, $clientip, $host_name) in # machine-setup sed -e "s/\$serverip/$serverip/;s/\$clientip/$clientip/" \ |