Move write-ifcfg to its own module

ifcfg config style is redhat specific, this should be in its own
module.

diff --git a/modules.d/40network/install b/modules.d/40network/install
index ee7c8711838e1498b303aa4206c2f4f3fcc189d6..8421af93fd1517ae62c200716cbef2db67b39000 100755 (executable)
--- a/modules.d/40network/install
+++ b/modules.d/40network/install
@@ -11,7 +11,3 @@ inst_hook cmdline 99 "$moddir/parse-ip-opts.sh"
 inst_hook cmdline 98 "$moddir/parse-bridge.sh"
 inst_hook cmdline 99 "$moddir/parse-ifname.sh"
 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 85 "$moddir/write-ifcfg.sh"

diff --git a/modules.d/45ifcfg/check b/modules.d/45ifcfg/check
new file mode 100644 (file)
index 0000000..0f6e457
--- /dev/null
+++ b/modules.d/45ifcfg/check
@@ -0,0 +1,6 @@
+#!/bin/sh
+[ -f /etc/redhat-release ] || exit 1
+
+[[ $1 = -d ]] && echo network
+
+exit 255

diff --git a/modules.d/45ifcfg/install b/modules.d/45ifcfg/install
new file mode 100644 (file)
index 0000000..2d0edd0
--- /dev/null
+++ b/modules.d/45ifcfg/install
@@ -0,0 +1,2 @@
+#!/bin/bash
+inst_hook pre-pivot 85 "$moddir/write-ifcfg.sh"

diff --git a/modules.d/40network/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
old mode 100755 (executable)
new mode 100644 (file)
similarity index 84%
rename from modules.d/40network/write-ifcfg.sh
rename to modules.d/45ifcfg/write-ifcfg.sh
index 3d9b3b1..fc8965c
--- a/modules.d/40network/write-ifcfg.sh
+++ b/modules.d/45ifcfg/write-ifcfg.sh
@@ -50,3 +50,11 @@ for netif in $IFACES ; do
         echo "NAME=$ethname" >> /tmp/ifcfg/ifcfg-$ethname
     fi
 done
+
+# Pass network opts
+mkdir /dev/.initramfs/
+cp /tmp/net.* /dev/.initramfs/ >/dev/null 2>&1
+mkdir -p /dev/.initramfs/state/etc/sysconfig/network-scripts/
+cp /tmp/resolv.conf /dev/.initramfs/state/etc/ >/dev/null 2>&1
+echo "files /etc/sysconfig/network-scripts" > /dev/.initramfs/rwtab
+cp -a /tmp/ifcfg/* /dev/.initramfs/state/etc/sysconfig/network-scripts/ >/dev/null 2>&1

diff --git a/modules.d/99base/init b/modules.d/99base/init
index 0f42967ecf9330d6f5427f07f158ce9ee07fb9cd..54d35ccb35d8eb64a236670ed66aedc3af758363 100755 (executable)
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
@@ -236,16 +236,6 @@ if getarg init= >/dev/null ; then
     unset CLINE
 fi
 
-# Prepare network opts for passing
-if [ -e /tmp/net.ifaces ]; then
-    mkdir /dev/.initramfs/
-    cp /tmp/net.* /dev/.initramfs/ >/dev/null 2>&1
-    mkdir -p /dev/.initramfs/state/etc/sysconfig/network-scripts/
-    cp /tmp/resolv.conf /dev/.initramfs/state/etc/ >/dev/null 2>&1
-    echo "files /etc/sysconfig/network-scripts" > /dev/.initramfs/rwtab
-    cp -a /tmp/ifcfg/* /dev/.initramfs/state/etc/sysconfig/network-scripts/ >/dev/null 2>&1
-fi
-
 # Debug: Copy state
 if getarg rdcopystate; then
     mkdir /dev/.initramfs/