2014-06-07 07:11:38 +02:00
|
|
|
From 2bddf461e38b952a79e31650ba828a7ee506cbe9 Mon Sep 17 00:00:00 2001
|
2014-04-09 14:44:32 +02:00
|
|
|
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.
|
|
|
|
|
2014-04-30 17:29:13 +02:00
|
|
|
- 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
|
2014-05-06 13:22:17 +02:00
|
|
|
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
|
|
Modified-by: Thomas Rennigner <trenn@suse.de>
|
2014-04-09 14:44:32 +02:00
|
|
|
---
|
2014-06-07 07:11:38 +02:00
|
|
|
modules.d/40network/ifup.sh | 1 +
|
|
|
|
modules.d/45ifcfg/module-setup.sh | 8 +++++++-
|
|
|
|
2 files changed, 8 insertions(+), 1 deletion(-)
|
2014-04-09 14:44:32 +02:00
|
|
|
|
2015-06-30 14:59:59 +02:00
|
|
|
Index: dracut-042/modules.d/40network/ifup.sh
|
2015-03-31 16:12:12 +02:00
|
|
|
===================================================================
|
2015-06-30 14:59:59 +02:00
|
|
|
--- dracut-042.orig/modules.d/40network/ifup.sh 2015-06-24 18:02:05.945177534 +0200
|
|
|
|
+++ dracut-042/modules.d/40network/ifup.sh 2015-06-24 18:02:06.605215110 +0200
|
|
|
|
@@ -184,6 +184,7 @@ do_dhcp() {
|
2014-04-09 14:44:32 +02:00
|
|
|
$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
|
|
|
|
}
|
2015-06-30 14:59:59 +02:00
|
|
|
Index: dracut-042/modules.d/45ifcfg/module-setup.sh
|
2015-03-31 16:12:12 +02:00
|
|
|
===================================================================
|
2015-06-30 14:59:59 +02:00
|
|
|
--- dracut-042.orig/modules.d/45ifcfg/module-setup.sh 2015-06-11 17:39:47.000000000 +0200
|
|
|
|
+++ dracut-042/modules.d/45ifcfg/module-setup.sh 2015-06-24 18:02:06.605215110 +0200
|
2015-03-31 16:12:12 +02:00
|
|
|
@@ -2,7 +2,13 @@
|
2014-02-17 14:21:58 +01:00
|
|
|
|
|
|
|
# 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
|
|
|
|
}
|
|
|
|
|