Thomas Renninger
054341caad
Update to dracut-044 and several cleanups. Works on tumbleweed standard installation and NFS root. OBS-URL: https://build.opensuse.org/request/show/346361 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=244
50 lines
1.7 KiB
Diff
50 lines
1.7 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-044/modules.d/40network/ifup.sh
|
|
===================================================================
|
|
--- dracut-044.orig/modules.d/40network/ifup.sh
|
|
+++ dracut-044/modules.d/40network/ifup.sh
|
|
@@ -189,6 +189,7 @@ do_dhcp() {
|
|
$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-044/modules.d/45ifcfg/module-setup.sh
|
|
===================================================================
|
|
--- dracut-044.orig/modules.d/45ifcfg/module-setup.sh
|
|
+++ dracut-044/modules.d/45ifcfg/module-setup.sh
|
|
@@ -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
|
|
}
|
|
|