rpms/kexec-tools
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert "dracut-module-setup.sh: pass correct ip= param for ipv6"

Browse Source 
This reverts commit 2f4149f276.

It is not proved to be right to get auto6 or dhcpv6 in 1st kernel,
pingfan is working on a dracut fix to do some fallback in 2nd kernel initramfs.
So revert this commit
This commit is contained in:
Dave Young 2018-05-09 14:21:51 +08:00
parent a95fcea412
commit 2884fed616
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dracut-module-setup.sh
View File

@ -293,12 +293,6 @@ kdump_setup_netdev() {
_static=$(kdump_static_ip $_netdev $_srcaddr) _static=$(kdump_static_ip $_netdev $_srcaddr)
if [ -n "$_static" ]; then if [ -n "$_static" ]; then
_proto=none _proto=none
elif is_ipv6_address $_srcaddr; then
if is_ipv6_auto $_netdev; then
_proto=auto6
else
_proto=dhcp6
fi
else else
_proto=dhcp _proto=dhcp
fi fi

12
kdump-lib.sh
View File

@ -310,18 +310,6 @@ is_atomic()
grep -q "ostree" /proc/cmdline grep -q "ostree" /proc/cmdline
} }
# fixme, try the best to decide whether the ipv6 addr is allocated by slaac or dhcp6
is_ipv6_auto()
{
local _netdev=$1
local _auto=$(cat /proc/sys/net/ipv6/conf/$_netdev/autoconf)
if [ $_auto -eq 1 ]; then
return 0
else
return 1
fi
}
is_ipv6_address() is_ipv6_address()
{ {
echo $1 | grep -q ":" echo $1 | grep -q ":"