stage2,initrd-*: fix adding udev rules for named network interfaces

If udev-rule-generator-net is installed on the system, add the interface naming rules from this package to the initrd. If not, add the standard udev rules.

stage2,initrd-*: fix adding udev rules for named network interfaces
45371fb5 · Anton Midyukov · ad6c7671 · 45371fb5 · 45371fb5 · 45371fb5
Commit 45371fb5 authored Mar 10, 2023 by Anton Midyukov
3 changed files
--- a/features.in/initrd-bootchain/stage1/scripts.d/80-make-initrd-for-bootchain
+++ b/features.in/initrd-bootchain/stage1/scripts.d/80-make-initrd-for-bootchain
@@ -25,8 +25,6 @@ FEATURES += bootchain-waitdev
 FEATURES += bootchain-getimage
 FEATURES += bootchain-nfs
 FEATURES += bootchain-cifs
-PUT_UDEV_RULES += *-net-setup-link.rules *-net-description.rules
-PUT_FILES += /lib/systemd/network/99-default.link
 EOF

 for module in $(grep -v ^# /.in/modules | sort -u | tr -s '\n' ' '); do

--- a/features.in/initrd-propagator/stage1/scripts.d/80-make-initrd-for-propagator
+++ b/features.in/initrd-propagator/stage1/scripts.d/80-make-initrd-for-propagator
@@ -20,8 +20,6 @@ done

 cat >> /etc/initrd.mk <<EOF
 FEATURES += add-modules compress cleanup
-PUT_UDEV_RULES += *-net-setup-link.rules *-net-description.rules
-PUT_FILES += /lib/systemd/network/99-default.link
 EOF

 for module in $(grep -v ^# /.in/modules | sort -u | tr -s '\n' ' '); do

--- a/features.in/stage2/stage1/scripts.d/10-initrd-udev-rules
+++ b/features.in/stage2/stage1/scripts.d/10-initrd-udev-rules
+#!/bin/sh -efu
+
+if rpm -q udev-rule-generator-net; then
+	cat >> /etc/initrd.mk <<-EOF
+	PUT_UDEV_RULES += 75-persistent-net-generator.rules
+	PUT_FILES += /lib/udev/write_net_rules
+	EOF
+else
+	cat >> /etc/initrd.mk <<-EOF
+	PUT_UDEV_RULES += *-net-setup-link.rules *-net-description.rules
+	PUT_FILES += /lib/systemd/network/99-default.link
+	EOF
+fi