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/etc | |
| 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/etc')
| -rw-r--r-- | initrd/initrd-stuff/etc/functions | 16 | ||||
| -rw-r--r-- | initrd/initrd-stuff/etc/messages | 9 |
2 files changed, 20 insertions, 5 deletions
diff --git a/initrd/initrd-stuff/etc/functions b/initrd/initrd-stuff/etc/functions index 351a4c6f..7ae7b7e0 100644 --- a/initrd/initrd-stuff/etc/functions +++ b/initrd/initrd-stuff/etc/functions @@ -2,7 +2,7 @@ # linux diskless clients (included by init, hwautocfg, # servconfig, ... 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 # Felix Endres, 30-04-2006 # Tobias Maier # @@ -420,6 +420,20 @@ sed 's/:.*/:!:13078:0:99999:7:::/;/^root.*/d' /tmp/newpasswd \ } ####################################################################### +# wait for the completion of configuration file (machine-setup). It is +# composed from different sources +cfgcomplete () { +waitfor /tmp/dhcp-done 10000 || error "$error_errdcfg" nonfatal +waitfor /tmp/file-done 10000 || error "$error_errfcfg" nonfatal +waitfor /tmp/ldap-done 10000 || error "$error_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 +} + +####################################################################### # localization simply derived from $language variable set in # machine-setup or other sources - mostly taken from knoppix localization () { diff --git a/initrd/initrd-stuff/etc/messages b/initrd/initrd-stuff/etc/messages index 9876a208..b9c4e155 100644 --- a/initrd/initrd-stuff/etc/messages +++ b/initrd/initrd-stuff/etc/messages @@ -3,7 +3,7 @@ # diskless clients of version 4 # this file could be used for localization of error messages # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 24-06-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 26-06-2006 # # Copyright: (c) 2006 - RZ Universitaet Freiburg # (c) 2006 - odlx.org project @@ -113,6 +113,10 @@ error_pump=" Config via pump not implemented yet.\n$error_dhcp" error_ipconf=" Config via ipconfig (from klibc) not implemented yet.\n\ $error_dhcp" error_ldapcfg=" The configuration via ldap is not implemented yet." +error_errdcfg=" Did not get any configuration data via dhcp until now ..." +error_errfcfg=" Did not get any configuration data via tftp until now ..." +error_errlcfg=" Did not get any configuration data via ldap until now ..." + # messages from distro functions df_errumod=" Failed to load the \"unix\" module. Problems with Hardware \ @@ -133,9 +137,6 @@ df_errnsc=" Name Service caching deamon $df_errserv\n This service might \ be useful to take load from a ldap user directory." # messages from servconfig -scfg_errdcfg=" Did not get any configuration data via dhcp until now ..." -scfg_errfcfg=" Did not get any configuration data via tftp until now ..." -scfg_errlcfg=" Did not get any configuration data via ldap until now ..." scfg_nfs=" Mount of some NFS source failed ..." scfg_ntptz=" No such timezone data file (needed for ntp time service \ configuration)." |