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

static ip configuration support

Browse Source 
Resolves: bz822739

We hardcoded with dhcp in dracut cmdline before.
Fix it by parsing  ifcfg to get the proper proto,
echo proper cmdline for both static and dhcp
[v1->v2]: amwang - handle PREFIX as well

Signed-off-by: Dave Young <dyoung@redhat.com>
Acked-by: Cong Wang <amwang@redhat.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
This commit is contained in:
Dave Young 2012-05-25 14:16:20 +08:00
parent e30ad0a4ec
commit 21398a5cdd
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dracut-module-setup.sh
View File

@ -39,12 +39,32 @@ kdump_is_bond() {
[ -d /sys/class/net/"$1"/bonding ] [ -d /sys/class/net/"$1"/bonding ]
} }
#$1: netdev name
#checking /etc/sysconfig/network-scripts/ifcfg-$1,
#if it use static ip echo it, or echo null
kdump_static_ip() {
. /etc/sysconfig/network-scripts/ifcfg-$1
if [ -n "$IPADDR" ]; then
[ -z "$NETMASK" -a -n "$PREFIX" ] && \
NETMASK=$(ipcalc -m $IPADDR/$PREFIX | cut -d'=' -f2)
echo -n "${IPADDR}::${GATEWAY}:${NETMASK}::"
fi
}
# Setup dracut to bringup a given network interface # Setup dracut to bringup a given network interface
kdump_setup_netdev() { kdump_setup_netdev() {
local _netdev=$1 local _netdev=$1
local _static _proto
_netmac=`ip addr show $_netdev 2>/dev/null|awk '/ether/{ print $2 }'` _netmac=`ip addr show $_netdev 2>/dev/null|awk '/ether/{ print $2 }'`
echo " ip=$_netdev:dhcp ifname=$_netdev:$_netmac rd.neednet=1" > ${initdir}/etc/cmdline.d/40ip.conf _static=$(kdump_static_ip $_netdev)
if [ -n "$_static" ]; then
_proto=none
else
_proto=dhcp
fi
echo " ip=${_static}$_netdev:${_proto} ifname=$_netdev:$_netmac rd.neednet=1" > ${initdir}/etc/cmdline.d/40ip.conf
if kdump_is_bridge "$_netdev"; then if kdump_is_bridge "$_netdev"; then
echo " bridge=$_netdev:$(cd /sys/class/net/$_netdev/brif/; echo *)" > ${initdir}/etc/cmdline.d/41bridge.conf echo " bridge=$_netdev:$(cd /sys/class/net/$_netdev/brif/; echo *)" > ${initdir}/etc/cmdline.d/41bridge.conf
@ -60,8 +80,7 @@ kdump_setup_netdev() {
#Function:kdump_install_net #Function:kdump_install_net
#$1: config values of net line in kdump.conf #$1: config values of net line in kdump.conf
kdump_install_net() { kdump_install_net() {
local _server local _server _netdev
local _netdev
local config_val="$1" local config_val="$1"
if strstr "$config_val" "@"; then if strstr "$config_val" "@"; then