Generate 70-persistent-net.rules when configuring node network

Force this to avoid any potential generation of "well known" names.

Simplify the ifcfg-* generation code here, since template subsitution
is not necessary.

Signed-off-by: Martin Schwenke <martin@meltin.net>

diff --git a/autocluster b/autocluster
index 54e74622ce0351cab9a179e9299e2b4c67a791d1..75b9951f05410238a8c7fd54492744a97d6624dc 100755 (executable)
--- a/autocluster
+++ b/autocluster
@@ -778,8 +778,7 @@ setup_network()
     while read netname dev ip mask mac opts; do
        echo "  $dev"
        cat <<EOF | \
-           diskimage substitute_vars \
-           - "/etc/sysconfig/network-scripts/ifcfg-${dev}"
+           diskimage put - "/etc/sysconfig/network-scripts/ifcfg-${dev}"
 DEVICE=$dev
 ONBOOT=yes
 TYPE=Ethernet
@@ -787,7 +786,15 @@ IPADDR=$ip
 NETMASK=$mask
 HWADDR=$mac
 EOF
-    done <"$network_map"
+
+       # This goes to 70-persistent-net.rules
+       cat <<EOF
+# Generated by autocluster
+SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="${mac}", ATTR{type}=="1", KERNEL=="eth*", NAME="${dev}"
+
+EOF
+    done <"$network_map" |
+    diskimage put - "/etc/udev/rules.d/70-persistent-net.rules"
 }
 
 register_hook setup_base_hooks setup_network