]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
write-ifcfg.sh: cleanups
authorWill Woods <wwoods@redhat.com>
Wed, 7 Mar 2012 22:21:53 +0000 (17:21 -0500)
committerHarald Hoyer <harald@redhat.com>
Thu, 8 Mar 2012 09:58:42 +0000 (10:58 +0100)
mkdir -p creates intermediate directories and never returns an error, so
we don't need to create the intermediate directories ourself.

modules.d/45ifcfg/write-ifcfg.sh

index d633a965312a89323ea12985139a81b48dd384be..0f431e3f23198d2a8670e22fb11adbb0893fd021 100755 (executable)
@@ -134,11 +134,10 @@ for netif in $IFACES ; do
 done
 
 # Pass network opts
-[ -d /run/initramfs ] || mkdir -m 0755 -p /run/initramfs
-cp /tmp/net.* /run/initramfs/ >/dev/null 2>&1
-for i in /run/initramfs/state /run/initramfs/state/etc/ /run/initramfs/state/etc/sysconfig /run/initramfs/state/etc/sysconfig/network-scripts; do
-    [ -d $i ] || mkdir -m 0755 -p $i
-done
-cp /tmp/net.$netif.resolv.conf /run/initramfs/state/etc/ >/dev/null 2>&1
-echo "files /etc/sysconfig/network-scripts" > /run/initramfs/rwtab
-cp -a -t /run/initramfs/state/etc/sysconfig/network-scripts/ /tmp/ifcfg/* >/dev/null 2>&1
+mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts
+echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab
+{
+    cp /tmp/net.* /run/initramfs/
+    cp /tmp/net.$netif.resolv.conf /run/initramfs/state/etc/
+    cp -a -t /run/initramfs/state/etc/sysconfig/network-scripts/ /tmp/ifcfg/*
+} > /dev/null 2>&1