diff options
| author | Oliver Tappe | 2007-07-06 23:47:40 +0200 |
|---|---|---|
| committer | Oliver Tappe | 2007-07-06 23:47:40 +0200 |
| commit | 71a46b3cef3367308d04e94171a00a975c189070 (patch) | |
| tree | 2036099efedd5e973db1bc19e4c9eb7a64a6dbed /initramfs/initrd-stuff/etc/functions | |
| parent | * fixed use of uninitialized value (diff) | |
| download | core-71a46b3cef3367308d04e94171a00a975c189070.tar.gz core-71a46b3cef3367308d04e94171a00a975c189070.tar.xz core-71a46b3cef3367308d04e94171a00a975c189070.zip | |
* now the contents of initramfs-setup are dumped to machine-setup, too,
in order to make it clearer what values had been given
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1228 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/initrd-stuff/etc/functions')
| -rw-r--r-- | initramfs/initrd-stuff/etc/functions | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions index 313bc61e..e97aa30d 100644 --- a/initramfs/initrd-stuff/etc/functions +++ b/initramfs/initrd-stuff/etc/functions @@ -486,7 +486,8 @@ waitfor /tmp/ldap-done 10000 || error "$error_errlcfg" nonfatal # concatenate the different files now into the central config file, order # matters - ldap data has highest priority if ! test -f /tmp/cfgcomplete ; then - for config in /tmp/confviadhcp /tmp/confviafile /tmp/confvialdap + for config in /etc/initramfs-setup /tmp/confviadhcp /tmp/confviafile \ + /tmp/confvialdap do test -f $config && cat $config >> /etc/machine-setup done # check again and replace @@@serverip@@@ |