[kexec-tools/f19] Remove "ip=" overwrite to 40ip.conf

Baoquan He baoquan at fedoraproject.org
Wed May 22 01:56:04 UTC 2013


commit e5f7442c7cf362803373a5dbad65ae93e4054761
Author: WANG Chao <chaowang at redhat.com>
Date:   Tue May 14 11:11:22 2013 +0800

    Remove "ip=" overwrite to 40ip.conf
    
    Currently we overwrite 40ip.conf to make ip and ifname both at the first
    line. But getarg() of dracut doesn't have the limitation that all
    cmdline args should be at the first line. Therefore, we can remove the
    overwrite safely.
    
    After applying this patch, in 2nd kernel,
    
    kdump:/# cat /etc/cmdline.d/40ip.conf
     ip=eth0:dhcp
     ifname=eth0:52:54:00:b2:98:05
    kdump:/# source /usr/lib/dracut/dracut-lib.sh
    kdump:/# getarg ip
    ip=eth0:dhcp
    kdump:/# getarg ifname
    ifname=eth0:52:54:00:b2:98:05
    
    Signed-off-by: WANG Chao <chaowang at redhat.com>
    Acked-by: Baoquan He <bhe at redhat.com>

 dracut-module-setup.sh |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
index 2e48057..0f8944c 100755
--- a/dracut-module-setup.sh
+++ b/dracut-module-setup.sh
@@ -198,7 +198,6 @@ kdump_setup_netdev() {
     elif kdump_is_vlan "$_netdev"; then
         kdump_setup_vlan "$_netdev"
     else
-        echo -n " ip=${_static}$_netdev:${_proto}" > ${initdir}/etc/cmdline.d/40ip.conf
         echo " ifname=$_netdev:$(kdump_get_mac_addr $_netdev)" >> ${initdir}/etc/cmdline.d/40ip.conf
     fi
 


More information about the scm-commits mailing list