Thomas Renninger
9f28177407
- Update to dracut mainline version 041. Half of the patches got integrated mainline. Some others have been merged together when it made sense some have been left out, but are still in the repository as they need some special treating and mainline discussion whether/how they get added. These are also not urgently needed, but are debugging patches. I broke the rule here to mention every added/deleted/modified patch as every patch is touched and every 2nd got removed (mainline integrated). I also re-ordered the patches in the PatchXY: area for easier merging them and get them discussed and posted mainline easier, topic by topic. OBS-URL: https://build.opensuse.org/request/show/293267 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=214
50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
From 2bddf461e38b952a79e31650ba828a7ee506cbe9 Mon Sep 17 00:00:00 2001
|
|
From: Pawel Wieczorkiewicz <pwieczorkiewicz@suse.de>
|
|
Date: Tue, 8 Apr 2014 08:48:27 +0200
|
|
Subject: [PATCH] 45ifcfg: use distro-specific scripts
|
|
|
|
Detect the system flavor and write the ifcfg files accordingly.
|
|
|
|
- Do not move ifcfg to -suse and -redhat files to avoid re-diffing after
|
|
each upgrade. Handle this in the spec file and a separate
|
|
write-ifcfg-suse.sh source file
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
Modified-by: Thomas Rennigner <trenn@suse.de>
|
|
---
|
|
modules.d/40network/ifup.sh | 1 +
|
|
modules.d/45ifcfg/module-setup.sh | 8 +++++++-
|
|
2 files changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
Index: dracut-041/modules.d/40network/ifup.sh
|
|
===================================================================
|
|
--- dracut-041.orig/modules.d/40network/ifup.sh 2015-03-17 12:38:28.586523363 +0100
|
|
+++ dracut-041/modules.d/40network/ifup.sh 2015-03-17 12:38:48.851658757 +0100
|
|
@@ -184,6 +184,7 @@
|
|
$dhclient --test $netif > /tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1}
|
|
dhcp_apply $1 || return $?
|
|
|
|
+ echo $netif > /tmp/net.${netif}.did-setup
|
|
echo $netif > /tmp/setup_net_${netif}.ok
|
|
return 0
|
|
}
|
|
Index: dracut-041/modules.d/45ifcfg/module-setup.sh
|
|
===================================================================
|
|
--- dracut-041.orig/modules.d/45ifcfg/module-setup.sh 2015-01-31 12:54:52.000000000 +0100
|
|
+++ dracut-041/modules.d/45ifcfg/module-setup.sh 2015-03-17 12:38:48.851658757 +0100
|
|
@@ -2,7 +2,13 @@
|
|
|
|
# called by dracut
|
|
check() {
|
|
- [[ -d /etc/sysconfig/network-scripts ]] && return 0
|
|
+ local link=$(readlink $moddir/write-ifcfg.sh)
|
|
+ [[ "$link" = "write-ifcfg-suse.sh" ]] && \
|
|
+ [[ -d /etc/sysconfig/network ]] && \
|
|
+ return 0
|
|
+ [[ "$link" = "write-ifcfg-redhat.sh" ]] && \
|
|
+ [[ -d /etc/sysconfig/network-scripts ]] && \
|
|
+ return 0
|
|
return 255
|
|
}
|
|
|