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
41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
From fc03504435d8bf5d0a31b8c566c2e783fbb96ec6 Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Wed, 30 Jul 2014 10:28:27 +0200
|
|
Subject: 40network: handle prefixed IP addresses correctly
|
|
|
|
If an IP address is given with prefix length ifup should be
|
|
parsing that correctly. And we should assume a prefix length
|
|
of /64 for IPv6 resp /24 for IPv4 if none were given.
|
|
|
|
References: bnc#880108
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
modules.d/40network/ifup.sh | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
Index: dracut-041/modules.d/40network/ifup.sh
|
|
===================================================================
|
|
--- dracut-041.orig/modules.d/40network/ifup.sh 2015-03-24 15:16:09.539033210 +0100
|
|
+++ dracut-041/modules.d/40network/ifup.sh 2015-03-24 15:16:16.595429551 +0100
|
|
@@ -223,11 +223,19 @@
|
|
[ -n "$macaddr" ] && ip link set address $macaddr dev $netif
|
|
[ -n "$mtu" ] && ip link set mtu $mtu dev $netif
|
|
[ -n "$mask" -a -z "$prefix" ] && prefix=$(mask_to_prefix $mask)
|
|
+ if [ "${ip##*/}" != "${ip}" ] ; then
|
|
+ prefix="${ip##*/}"
|
|
+ ip="${ip%/*}"
|
|
+ fi
|
|
if strglobin $ip '*:*:*'; then
|
|
+ # Always assume /64 prefix for IPv6
|
|
+ [ -z "$prefix" ] && prefix=64
|
|
# note no ip addr flush for ipv6
|
|
ip addr add $ip/$prefix ${srv:+peer $srv} dev $netif
|
|
wait_for_ipv6_dad $netif
|
|
else
|
|
+ # Assume /24 prefix for IPv4
|
|
+ [ -z "$prefix" ] && prefix=24
|
|
ip addr flush dev $netif
|
|
ip addr add $ip/$prefix ${srv:+peer $srv} brd + dev $netif
|
|
fi
|