[PATCH] udev-rules: include *-net-*.rules only if network module is included

[PATCH] udev-rules: include *-net-*.rules only if network module is included

[Alexander Tsoy]

Users have a choice to disable predictable network names by creating
a symlink in /etc:
ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules

However this doesn't work with non-hostonly initramfs if network drivers are
compiled into the kernel - network interfaces gets renamed by udev from
initramfs.

So if "network" module is not included in initramfs, let's rename network
interfaces during coldplug after switching root.

https://bugs.gentoo.org/show_bug.cgi?id=487184
---
 modules.d/95udev-rules/module-setup.sh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
index 2d36712..199e9a3 100755
--- a/modules.d/95udev-rules/module-setup.sh
+++ b/modules.d/95udev-rules/module-setup.sh
@@ -32,8 +32,6 @@ install() {
         60-pcmcia.rules \
         50-udev.rules 95-late.rules \
         50-firmware.rules \
-        75-net-description.rules \
-        80-net-name-slot.rules 80-net-setup-link.rules \
         "$moddir/59-persistent-storage.rules" \
         "$moddir/61-persistent-storage.rules"
 
@@ -43,12 +41,16 @@ install() {
     # eudev rules
     inst_rules 80-drivers-modprobe.rules
 
-    for _i in \
-        ${systemdutildir}/network/*.link \
-        ${hostonly:+/etc/systemd/network/*.link} \
-        ; do
-        [[ -e "$_i" ]] && inst "$_i"
-    done
+    if dracut_module_included "network"; then
+        inst_rules 75-net-description.rules \
+            80-net-name-slot.rules 80-net-setup-link.rules
+        for _i in \
+            ${systemdutildir}/network/*.link \
+            ${hostonly:+/etc/systemd/network/*.link} \
+            ; do
+            [[ -e "$_i" ]] && inst "$_i"
+        done
+    fi
 
     {
         for i in cdrom tape dialout floppy; do
-- 
1.8.3.2

Re: [PATCH] udev-rules: include *-net-*.rules only if network module is included

[Harald Hoyer]

On 03/05/2014 02:07 PM, Alexander Tsoy wrote:
> Users have a choice to disable predictable network names by creating
> a symlink in /etc:
> ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules

I would rather let them use the kernel cmdline switch:
net.ifnames=0

That way, it doesn't matter how the udev rules are named.

> 
> However this doesn't work with non-hostonly initramfs if network drivers are
> compiled into the kernel - network interfaces gets renamed by udev from
> initramfs.
> 
> So if "network" module is not included in initramfs, let's rename network
> interfaces during coldplug after switching root.
> 
> https://bugs.gentoo.org/show_bug.cgi?id=487184
> ---
>  modules.d/95udev-rules/module-setup.sh | 18 ++++++++++--------
>  1 file changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
> index 2d36712..199e9a3 100755
> --- a/modules.d/95udev-rules/module-setup.sh
> +++ b/modules.d/95udev-rules/module-setup.sh
> @@ -32,8 +32,6 @@ install() {
>          60-pcmcia.rules \
>          50-udev.rules 95-late.rules \
>          50-firmware.rules \
> -        75-net-description.rules \
> -        80-net-name-slot.rules 80-net-setup-link.rules \
>          "$moddir/59-persistent-storage.rules" \
>          "$moddir/61-persistent-storage.rules"
>  
> @@ -43,12 +41,16 @@ install() {
>      # eudev rules
>      inst_rules 80-drivers-modprobe.rules
>  
> -    for _i in \
> -        ${systemdutildir}/network/*.link \
> -        ${hostonly:+/etc/systemd/network/*.link} \
> -        ; do
> -        [[ -e "$_i" ]] && inst "$_i"
> -    done
> +    if dracut_module_included "network"; then
> +        inst_rules 75-net-description.rules \
> +            80-net-name-slot.rules 80-net-setup-link.rules
> +        for _i in \
> +            ${systemdutildir}/network/*.link \
> +            ${hostonly:+/etc/systemd/network/*.link} \
> +            ; do
> +            [[ -e "$_i" ]] && inst "$_i"
> +        done
> +    fi
>  
>      {
>          for i in cdrom tape dialout floppy; do
>