89f9350d9e
- Fix dmraid issue bnc#905746 A dracut_dmraid_use_udev.patch - Taken over from SLE12 A fips_add_aesni-intel.patch - Do not touch /run vs /var/run bnc#922676 D 0106-dracut-Enable-converting-of-directory-var-run-var-lo.patch - Update dracut to version 042 Remove these already included or unneeded patches: D dracut_v041_to_HEAD.patch D 0011-Correct-paths-for-openSUSE.patch D 0068-95fcoe-uefi-Test-for-EFI-firmware.patch D 0170-enable-logitech-hidpp.patch Adjust/refresh: M 0015-40network-replace-dhclient-with-wickedd-dhcp-supplic.patch M 0016-Add-new-s390x-specific-rule-files.patch M 0017-45ifcfg-use-distro-specific-scripts.patch M 0019-40network-Fix-race-condition-when-wait-for-networks.patch M 0020-00warpclock-Set-correct-timezone.patch M 0021-95dcssblk-Add-new-module-for-DCSS-block-devices.patch M 0048-40network-Only-enable-network-interfaces-if-explicit.patch M 0053-01fips-fixup-loading-issues.patch M 0056-81cio_ignore-handle-cio_ignore-commandline.patch M 0057-01fips-Include-some-more-hmacs.patch M 0058-dracut-add-warning-when-including-unsupported-module.patch M 0059-99suse-Add-SUSE-specific-initrd-parsing.patch M 0060-45ifcfg-Add-SUSE-specific-write-ifcfg-file.patch M 0061-45ifcfg-Fixup-error-message-in-write-ifcfg-suse.patch M 0066-40network-always-start-netroot-in-ifup.sh.patch M 0075-95dasd_rules-enable-parsing-of-rd.dasd-commandline-p.patch M 0076-Correctly-set-cio_ignore-for-dynamic-s390-rules.patch OBS-URL: https://build.opensuse.org/request/show/314510 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=219
41 lines
1.6 KiB
Diff
41 lines
1.6 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-042/modules.d/40network/ifup.sh
|
|
===================================================================
|
|
--- dracut-042.orig/modules.d/40network/ifup.sh 2015-06-24 18:02:23.090153581 +0200
|
|
+++ dracut-042/modules.d/40network/ifup.sh 2015-06-24 18:02:27.658413647 +0200
|
|
@@ -223,11 +223,19 @@ do_static() {
|
|
[ -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
|