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
84 lines
3.3 KiB
Diff
84 lines
3.3 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-041/modules.d/40network/ifup.sh
|
|
===================================================================
|
|
--- dracut-041.orig/modules.d/40network/ifup.sh 2015-03-17 17:19:54.375944711 +0100
|
|
+++ dracut-041/modules.d/40network/ifup.sh 2015-03-17 17:24:27.803263036 +0100
|
|
@@ -399,6 +399,18 @@
|
|
[ "$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
|
|
namesrv="$dns1 $dns2 $(getargs nameserver)"
|
|
for s in $namesrv; do
|
|
@@ -412,7 +424,7 @@
|
|
|
|
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-041/modules.d/40network/module-setup.sh
|
|
===================================================================
|
|
--- dracut-041.orig/modules.d/40network/module-setup.sh 2015-03-17 17:19:54.383945160 +0100
|
|
+++ dracut-041/modules.d/40network/module-setup.sh 2015-03-17 17:24:05.189997137 +0100
|
|
@@ -99,6 +99,10 @@
|
|
|
|
_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-041/modules.d/40network/parse-ip-opts.sh
|
|
===================================================================
|
|
--- dracut-041.orig/modules.d/40network/parse-ip-opts.sh 2015-03-17 17:24:05.193997361 +0100
|
|
+++ dracut-041/modules.d/40network/parse-ip-opts.sh 2015-03-17 17:26:56.711605514 +0100
|
|
@@ -67,7 +67,13 @@
|
|
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"
|