From 47b5c0f2907e7e8c596b2a36062ebdd77a8f64f9 Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Fri, 24 Jul 2009 15:26:33 -0400 Subject: [PATCH] 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. --- modules.d/40network/install | 2 +- modules.d/40network/write-ifcfg.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules.d/40network/install b/modules.d/40network/install index e66c72f8..34aed932 100755 --- 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 4fa59e0e..7da99598 100755 --- 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