From 7a1599223988fcbb0dc0c10799d1e22cd80527c1 Mon Sep 17 00:00:00 2001 From: daniceexi Date: Fri, 15 Jul 2011 11:14:59 +0000 Subject: [PATCH] defect 3324448: generate the ifcfg-x configuration file when running genimage -i, but keep the ONBOOT=no to skip the break of nfs-based system git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10097 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/share/xcat/netboot/debian/genimage | 9 +++++---- xCAT-server/share/xcat/netboot/rh/genimage | 15 ++++++++------- xCAT-server/share/xcat/netboot/sles/genimage | 13 +++++++------ xCAT-server/share/xcat/netboot/suse/genimage | 9 +++++---- xCAT-server/share/xcat/netboot/ubuntu/genimage | 9 +++++---- 5 files changed, 30 insertions(+), 25 deletions(-) diff --git a/xCAT-server/share/xcat/netboot/debian/genimage b/xCAT-server/share/xcat/netboot/debian/genimage index 7bf7ce222..47d8cbec3 100755 --- a/xCAT-server/share/xcat/netboot/debian/genimage +++ b/xCAT-server/share/xcat/netboot/debian/genimage @@ -1090,10 +1090,11 @@ sub generic_post { #This function is meant to leave the image in a state approxi open($cfgfile,">","$rootimg_dir/etc/resolv.conf"); print $cfgfile "#Dummy resolv.conf to make boot cleaner"; close($cfgfile); - #this code breaks statelite see defect 3324448 - #open($cfgfile,">","$rootimg_dir/etc/sysconfig/network-scripts/ifcfg-$prinic"); - #print $cfgfile "ONBOOT=yes\nBOOTPROTO=dhcp\nDEVICE=$prinic\n"; - #close($cfgfile); + # Create the ifcfg-x file for diskless node. But keep the ONBOOT=no + # to skip the break of nfs-based boot + open($cfgfile,">","$rootimg_dir/etc/sysconfig/network-scripts/ifcfg-$prinic"); + print $cfgfile "ONBOOT=no\nBOOTPROTO=dhcp\nDEVICE=$prinic\n"; + close($cfgfile); foreach (split /,/,$othernics) { if (/^$/) { next; } open($cfgfile,">","$rootimg_dir/etc/sysconfig/network-scripts/ifcfg-$_"); diff --git a/xCAT-server/share/xcat/netboot/rh/genimage b/xCAT-server/share/xcat/netboot/rh/genimage index 387642394..dd63b7791 100755 --- a/xCAT-server/share/xcat/netboot/rh/genimage +++ b/xCAT-server/share/xcat/netboot/rh/genimage @@ -1319,13 +1319,14 @@ sub generic_post { #This function is meant to leave the image in a state approxi open($cfgfile,">","$rootimg_dir/etc/resolv.conf"); print $cfgfile "#Dummy resolv.conf to make boot cleaner"; close($cfgfile); -# TODO -#this code breaks statelite see defect 3324448 - #if ($prinic) { - # open($cfgfile,">","$rootimg_dir/etc/sysconfig/network-scripts/ifcfg-$prinic"); - # print $cfgfile "ONBOOT=yes\nBOOTPROTO=dhcp\nDEVICE=$prinic\n"; - # close($cfgfile); - #} + + # Create the ifcfg-x file for diskless node. But keep the ONBOOT=no + # to skip the break of nfs-based boot + if ($prinic) { + open($cfgfile,">","$rootimg_dir/etc/sysconfig/network-scripts/ifcfg-$prinic"); + print $cfgfile "ONBOOT=no\nBOOTPROTO=dhcp\nDEVICE=$prinic\n"; + close($cfgfile); + } foreach (split /,/,$othernics) { if (/^$/) { next; } open($cfgfile,">","$rootimg_dir/etc/sysconfig/network-scripts/ifcfg-$_"); diff --git a/xCAT-server/share/xcat/netboot/sles/genimage b/xCAT-server/share/xcat/netboot/sles/genimage index be7c12650..94ccd6361 100755 --- a/xCAT-server/share/xcat/netboot/sles/genimage +++ b/xCAT-server/share/xcat/netboot/sles/genimage @@ -1324,12 +1324,13 @@ sub generic_post { # This function is meant to leave the image in a state approx open($cfgfile,">","$rootimg_dir/etc/resolv.conf"); print $cfgfile "#Dummy resolv.conf to make boot cleaner"; close($cfgfile); - #this code breaks statelite see defect 3324448 - # if ($prinic) { - # open($cfgfile,">","$rootimg_dir/etc/sysconfig/network/ifcfg-$prinic"); - # print $cfgfile "ONBOOT=yes\nBOOTPROTO=dhcp\nDEVICE=$prinic\nSTARTMODE=auto\n"; - # close($cfgfile); - # } + # Create the ifcfg-x file for diskless node. But keep the ONBOOT=no + # to skip the break of nfs-based boot + if ($prinic) { + open($cfgfile,">","$rootimg_dir/etc/sysconfig/network/ifcfg-$prinic"); + print $cfgfile "ONBOOT=no\nBOOTPROTO=dhcp\nDEVICE=$prinic\nSTARTMODE=auto\n"; + close($cfgfile); + } foreach (split /,/,$othernics) { next if (/^$/); diff --git a/xCAT-server/share/xcat/netboot/suse/genimage b/xCAT-server/share/xcat/netboot/suse/genimage index 1152a297e..f6961efff 100755 --- a/xCAT-server/share/xcat/netboot/suse/genimage +++ b/xCAT-server/share/xcat/netboot/suse/genimage @@ -763,10 +763,11 @@ sub generic_post { #This function is meant to leave the image in a state approxi open($cfgfile,">","$rootimg_dir/etc/resolv.conf"); print $cfgfile "#Dummy resolv.conf to make boot cleaner"; close($cfgfile); - #this code breaks statelite see defect 3324448 - #open($cfgfile,">","$rootimg_dir/etc/sysconfig/network-scripts/ifcfg-$prinic"); - #print $cfgfile "ONBOOT=yes\nBOOTPROTO=dhcp\nDEVICE=$prinic\n"; - #close($cfgfile); + # Create the ifcfg-x file for diskless node. But keep the ONBOOT=no + # to skip the break of nfs-based boot + open($cfgfile,">","$rootimg_dir/etc/sysconfig/network-scripts/ifcfg-$prinic"); + print $cfgfile "ONBOOT=no\nBOOTPROTO=dhcp\nDEVICE=$prinic\n"; + close($cfgfile); foreach (split /,/,$othernics) { if (/^$/) { next; } open($cfgfile,">","$rootimg_dir/etc/sysconfig/network-scripts/ifcfg-$_"); diff --git a/xCAT-server/share/xcat/netboot/ubuntu/genimage b/xCAT-server/share/xcat/netboot/ubuntu/genimage index db82f026a..f99ab6599 100755 --- a/xCAT-server/share/xcat/netboot/ubuntu/genimage +++ b/xCAT-server/share/xcat/netboot/ubuntu/genimage @@ -1092,10 +1092,11 @@ sub generic_post { #This function is meant to leave the image in a state approxi open($cfgfile,">","$rootimg_dir/etc/resolv.conf"); print $cfgfile "#Dummy resolv.conf to make boot cleaner"; close($cfgfile); - #this code breaks statelite see defect 3324448 - # open($cfgfile,">","$rootimg_dir/etc/sysconfig/network-scripts/ifcfg-$prinic"); - # print $cfgfile "ONBOOT=yes\nBOOTPROTO=dhcp\nDEVICE=$prinic\n"; - # close($cfgfile); + # Create the ifcfg-x file for diskless node. But keep the ONBOOT=no + # to skip the break of nfs-based boot + open($cfgfile,">","$rootimg_dir/etc/sysconfig/network-scripts/ifcfg-$prinic"); + print $cfgfile "ONBOOT=no\nBOOTPROTO=dhcp\nDEVICE=$prinic\n"; + close($cfgfile); foreach (split /,/,$othernics) { if (/^$/) { next; } open($cfgfile,">","$rootimg_dir/etc/sysconfig/network-scripts/ifcfg-$_");