233f49d9a7
Modify 0017-45ifcfg-use-distro-specific-scripts.patch: - Also revert upstream commit f34e1d6b to not forcibly include network and ifcfg modules (bsc#960669) Refresh: - 0094-Implement-shortcut-ip-ifname-static-for-static-confi.patch - 0132-40network-fixup-static-network-configuration.patch - 0142-40network-Don-t-report-error-for-etc-sysconfig-netwo.patch - 0402-driver-fail-summary.patch Add 0209-fix_modules_load_d_hostonly.patch: - Fix modules-load.d with hostonly (boo#962224) OBS-URL: https://build.opensuse.org/request/show/356300 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=248
84 lines
3.2 KiB
Diff
84 lines
3.2 KiB
Diff
From a345cf3c3d7c15cfca5735c531f825062235c135 Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Wed, 2 Jul 2014 11:20:22 +0200
|
|
Subject: Implement shortcut 'ip=<ifname>:static' for static configuration
|
|
|
|
To simplify static configurate we should be pulling in the
|
|
existing 'ifcfg' files when running in hostonly mode.
|
|
With that we can implement the shortcut 'ip=<ifname>:static'
|
|
to use the existing configuration from the ifcfg file.
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
modules.d/40network/ifup.sh | 14 +++++++++++++-
|
|
modules.d/40network/module-setup.sh | 4 ++++
|
|
modules.d/40network/parse-ip-opts.sh | 8 +++++++-
|
|
3 files changed, 24 insertions(+), 2 deletions(-)
|
|
|
|
Index: dracut-044/modules.d/40network/ifup.sh
|
|
===================================================================
|
|
--- dracut-044.orig/modules.d/40network/ifup.sh
|
|
+++ dracut-044/modules.d/40network/ifup.sh
|
|
@@ -421,6 +421,18 @@ for p in $(getargs ip=); do
|
|
[ "$use_bridge" != 'true' ] && \
|
|
[ "$use_vlan" != 'true' ] && continue
|
|
|
|
+ if [ "$autoconf" = "static" ] &&
|
|
+ [ -e /etc/sysconfig/network/ifcfg-${netif} ] ; then
|
|
+ # Pull in existing static configuration
|
|
+ . /etc/sysconfig/network/ifcfg-${netif}
|
|
+ ip=${IPADDR}
|
|
+ mask=${PREFIXLEN}
|
|
+ mtu=${MTU}
|
|
+ server=${REMOTE_IPADDR}
|
|
+ gw=${GATEWAY}
|
|
+ autoconf=${BOOTPROTO}
|
|
+ fi
|
|
+
|
|
# setup nameserver
|
|
for s in "$dns1" "$dns2" $(getargs nameserver); do
|
|
[ -n "$s" ] || continue
|
|
@@ -434,7 +446,7 @@ for p in $(getargs ip=); do
|
|
|
|
for autoopt in $(str_replace "$autoconf" "," " "); do
|
|
case $autoopt in
|
|
- dhcp|on|any)
|
|
+ dhcp4|dhcp|on|any)
|
|
do_dhcp -4 ;;
|
|
dhcp6)
|
|
load_ipv6
|
|
Index: dracut-044/modules.d/40network/module-setup.sh
|
|
===================================================================
|
|
--- dracut-044.orig/modules.d/40network/module-setup.sh
|
|
+++ dracut-044/modules.d/40network/module-setup.sh
|
|
@@ -58,6 +58,10 @@ install() {
|
|
|
|
_arch=$(uname -m)
|
|
|
|
+ [[ $hostonly ]] && {
|
|
+ inst_multiple /etc/sysconfig/network/ifcfg-*
|
|
+ }
|
|
+
|
|
inst_libdir_file {"tls/$_arch/",tls/,"$_arch/",}"libnss_dns.so.*" \
|
|
{"tls/$_arch/",tls/,"$_arch/",}"libnss_mdns4_minimal.so.*"
|
|
|
|
Index: dracut-044/modules.d/40network/parse-ip-opts.sh
|
|
===================================================================
|
|
--- dracut-044.orig/modules.d/40network/parse-ip-opts.sh
|
|
+++ dracut-044/modules.d/40network/parse-ip-opts.sh
|
|
@@ -69,7 +69,13 @@ for p in $(getargs ip=); do
|
|
for autoopt in $(str_replace "$autoconf" "," " "); do
|
|
case $autoopt in
|
|
error) die "Error parsing option 'ip=$p'";;
|
|
- bootp|rarp|both) die "Sorry, ip=$autoopt is currenty unsupported";;
|
|
+ bootp|rarp|both) die "Sorry, ip=$autoopt is currently unsupported";;
|
|
+ static)
|
|
+ if [ ! -e /etc/sysconfig/network/ifcfg-${dev} ] ; then
|
|
+ warn "No ifcfg configuration present for interface $dev, skipping"
|
|
+ continue
|
|
+ fi
|
|
+ ;;
|
|
none|off)
|
|
[ -z "$ip" ] && \
|
|
die "For argument 'ip=$p'\nValue '$autoopt' without static configuration does not make sense"
|