With NFS root, it is possible /tmp/net.ifaces might not exist during pre-pivot.

- udevadm settle will wait for it if necessary.
- Move write-ifcfg.sh later during pre-pivot to reduce likelihood of settling being necessary.

diff --git a/modules.d/40network/install b/modules.d/40network/install
index e66c72f801d26a86c0444edbb6fd3b17540e9d99..34aed93256be3cfc5cae37e4f1f9b259a1a5046e 100755 (executable)
--- a/modules.d/40network/install
+++ b/modules.d/40network/install
@@ -12,6 +12,6 @@ inst_hook pre-pivot 10 "$moddir/kill-dhclient.sh"
 
 # TODO ifcfg config style is redhat specific, this should probably
 # go into its own module at one time
-inst_hook pre-pivot 20 "$moddir/write-ifcfg.sh"
+inst_hook pre-pivot 85 "$moddir/write-ifcfg.sh"
 
 mkdir -p "${initdir}/var/run"

diff --git a/modules.d/40network/write-ifcfg.sh b/modules.d/40network/write-ifcfg.sh
index 4fa59e0eb155a823ceae285725bdc74067c86d8f..7da99598186cf65fc775670fccdc5c839517a4c2 100755 (executable)
--- a/modules.d/40network/write-ifcfg.sh
+++ b/modules.d/40network/write-ifcfg.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# NFS root might have reached here before /tmp/net.ifaces was written
+udevadm settle --timeout=30
 # Don't write anything if we don't know our bootdev
 [ -f /tmp/net.ifaces ] || return 1