summaryrefslogtreecommitdiffstats
path: root/initramfs/initrd-stuff/etc/functions
diff options
context:
space:
mode:
Diffstat (limited to 'initramfs/initrd-stuff/etc/functions')
-rw-r--r--initramfs/initrd-stuff/etc/functions3
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@@@