arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added NM_CONTROLLED=no for configib and configeth and changed BOOTPROTO=none for redhat in both files for bug 3499

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@16160 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
billwajda 2013-05-02 15:01:28 +00:00
parent 3713a0de0b
commit 1f1430f074
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xCAT/postscripts/configeth
View File

@ -194,6 +194,7 @@ for ($i=0; $i < (scalar @nic_ips4) ; $i++ ) {
# the system
print FILE "DEVICE=\'$nic\'\n";
print FILE "BOOTPROTO=\'static\'\n";
print FILE "NM_CONTROLLED=\'no\'\n";
print FILE "BROADCAST=\'\'\n";
print FILE "ETHTOOL_OPTIONS=\'\'\n";
print FILE "IPADDR=\'".$nic_ips4[$i]."\'\n";
@ -226,6 +227,7 @@ for ($i=0; $i < (scalar @nic_ips4) ; $i++ ) {
if (!open(FILE, ">$dir/ifcfg-$specific_nic")) { system("logger -t xcat -p local4.err 'configeth: cannot open $dir/ifcfg-$specific_nic.'"); exit 1; }
print FILE "DEVICE=$specific_nic\n";
print FILE "BOOTPROTO=none\n";
print FILE "NM_CONTROLLED=no\n";
print FILE "IPADDR=$nic_ips4[$i]\n";
print FILE "NETMASK=$netmask\n";
#if (defined($gateway)) { print FILE "GATEWAY=$gateway\n"; }
@ -298,6 +300,7 @@ for ($i=0; $i < (scalar @nic_ips6) ; $i++ )
}
print FILE "DEVICE=$nic\n";
print FILE "BOOTPROTO=static\n";
print FILE "NM_CONTROLLED=no\n";
print FILE "STARTMODE=onboot\n";
} else {
if (!open(FILE, ">>$dir/ifcfg-$nic")) {
@ -331,7 +334,8 @@ for ($i=0; $i < (scalar @nic_ips6) ; $i++ )
exit 1;
}
print FILE "DEVICE=$nic\n";
print FILE "BOOTPROTO=static\n";
print FILE "BOOTPROTO=none\n";
print FILE "NM_CONTROLLED=no\n";
print FILE "ONBOOT=yes\n";
} else {
if (!open(FILE, ">>$dir/ifcfg-$nic")) {

7
xCAT/postscripts/configib
View File

@ -313,6 +313,7 @@ do
then
# Write the info to the ifcfg file
echo "DEVICE=$nic
NM_CONTROLLED=no
BOOTPROTO=static
STARTMODE=onboot
IPADDR=$nicip" > $dir/ifcfg-$nic
@ -355,7 +356,8 @@ IPADDR_$ipindex=$nicip" >> $dir/ifcfg-$nic
then
# Write the info to the ifcfg file
echo "DEVICE=$nic
BOOTPROTO=static
NM_CONTROLLED=no
BOOTPROTO=none
ONBOOT=yes
IPADDR=$nicip" > $dir/ifcfg-$nic
# ipv6
@ -394,7 +396,8 @@ IPV6ADDR=$nicip/$netmask" >> $dir/ifcfg-$nic
fi
else # ipv4 address
echo "DEVICE=$nic:$ipindex
BOOTPROTO=static
NM_CONTROLLED=no
BOOTPROTO=none
ONBOOT=yes
IPADDR=$nicip" > $dir/ifcfg-$nic:$ipindex
if [[ "$OSVER" == rhels6* ]]