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

Remove duplicated entries in /etc/sysctl.conf

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6534 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wanghuaz 2010-06-18 10:51:05 +00:00
parent 109b74acf2
commit 80c580de58
2 changed files with 88 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
xCAT-server/share/xcat/ib/scripts/configiba.1port
View File

@ -55,13 +55,11 @@ foreach my $num ( @nums ) {
}
if ( -f "/etc/sysctl.conf" )
{
updatefile("/etc/sysctl.conf", "net.ipv4.conf.$nic.arp_filter");
updatefile("/etc/sysctl.conf", "net.ipv4.conf.$nic.arp_ignore");
runcmd("echo 'net.ipv4.conf.$nic.arp_filter=1' >> /etc/sysctl.conf");
runcmd("echo 'net.ipv4.conf.$nic.arp_ignore=1' >> /etc/sysctl.conf");
}
if ( -f "/etc/infiniband/openib.conf" )
{
runcmd("/usr/bin/sed -i 's/SDP_LOAD=yes/SDP_LOAD=no/g' /etc/infiniband/openib.conf");
}
# Write the info to the ifcfg file
my $dir;
@ -108,19 +106,27 @@ foreach my $num ( @nums ) {
}
if ( $PLTFRM eq "Linux" ) {
if ( -f "/etc/infiniband/openib.conf" )
{
updatefile("/etc/infiniband/openib.conf", "SDP_LOAD=yes", "SDP_LOAD=no");
}
if ( $OS_name eq 'suse')
{
updatefile("/etc/modprobe.conf", "options ib_ehca nr_ports");
updatefile("/etc/modprobe.conf", "options ib_ehca lock_hcalls");
runcmd("echo 'options ib_ehca nr_ports=1' >> /etc/modprobe.conf");
runcmd("echo 'options ib_ehca lock_hcalls=0' >> /etc/modprobe.conf");
}
runcmd("sysctl -p");
my $openibd_cmd = "/sbin/chkconfig --level 2345 openibd on";
runcmd($openibd_cmd);
my $openibd_start_cmd = "/sbin/service openibd restart";
runcmd($openibd_start_cmd);
runcmd("sysctl -p");
sleep(20);
foreach my $nic ( @nics ) {
sleep(5);
@ -174,3 +180,33 @@ sub runcmd {
}
}
sub updatefile {
my $fname = shift;
my $old = shift;
my $new = shift;
unless ( open( HOSTS,"<$fname" )) {
return undef;
}
my @rawdata = <HOSTS>;
my @newdata = ();
close( HOSTS );
chomp @rawdata;
foreach my $line ( @rawdata ) {
if ( $line =~ /^(.*)$old(.*)$/ ) {
if ( $new ) {
push @newdata, "$1$new$2";
}
} else {
push @newdata, $line;
}
}
unless ( open( HOSTS,">$fname" )) {
return undef;
}
for my $line (@newdata)
{
print HOSTS "$line\n";
}
close( HOSTS );
}

58
xCAT-server/share/xcat/ib/scripts/configiba.2ports
View File

@ -55,17 +55,10 @@ foreach my $num ( @nums ) {
}
if ( -f "/etc/sysctl.conf" )
{
runcmd("echo 'net.ipv4.conf.$nic.arp_filter=1' >> /etc/sysctl.conf");
runcmd("echo 'net.ipv4.conf.$nic.arp_ignore=1' >> /etc/sysctl.conf");
}
if ( -f "/etc/infiniband/openib.conf" )
{
runcmd("/usr/bin/sed -i 's/SDP_LOAD=yes/SDP_LOAD=no/g' /etc/infiniband/openib.conf");
}
if ( -f "/etc/modprobe.conf" )
{
runcmd("sed -i 's/options\ ib_ehca\ nr_ports=1//g' /etc/modprobe.conf");
runcmd("sed -i 's/options\ ib_ehca\ lock_hcalls=0//g' /etc/modprobe.conf");
updatefile("/etc/sysctl.conf", "net.ipv4.conf.$nic.arp_filter");
updatefile("/etc/sysctl.conf", "net.ipv4.conf.$nic.arp_ignore");
runcmd("echo 'net.ipv4.conf.$nic.arp_filter = 1' >> /etc/sysctl.conf");
runcmd("echo 'net.ipv4.conf.$nic.arp_ignore = 1' >> /etc/sysctl.conf");
}
# Write the info to the ifcfg file
my $dir;
@ -115,13 +108,24 @@ foreach my $num ( @nums ) {
if ( $PLTFRM eq "Linux" ) {
runcmd("sysctl -p");
if ( -f "/etc/infiniband/openib.conf" )
{
updatefile("/etc/infiniband/openib.conf", "SDP_LOAD=yes", "SDP_LOAD=no");
}
if ( -f "/etc/modprobe.conf" )
{
updatefile("/etc/modprobe.conf", "options ib_ehca nr_ports=1");
updatefile("/etc/modprobe.conf", "options ib_ehca lock_hcalls=0");
}
runcmd("echo 'options ib_ehca lock_hcalls=0' >> /etc/modprobe.conf");
my $openibd_cmd = "/sbin/chkconfig --level 2345 openibd on";
runcmd($openibd_cmd);
my $openibd_start_cmd = "/sbin/service openibd restart";
runcmd($openibd_start_cmd);
runcmd("sysctl -p");
sleep(20);
foreach my $nic ( @nics ) {
sleep(5);
@ -181,3 +185,33 @@ sub runcmd {
}
}
sub updatefile {
my $fname = shift;
my $old = shift;
my $new = shift;
unless ( open( HOSTS,"<$fname" )) {
return undef;
}
my @rawdata = <HOSTS>;
my @newdata = ();
close( HOSTS );
chomp @rawdata;
foreach my $line ( @rawdata ) {
if ( $line =~ /^(.*)$old(.*)$/ ) {
if ( $new ) {
push @newdata, "$1$new$2";
}
} else {
push @newdata, $line;
}
}
unless ( open( HOSTS,">$fname" )) {
return undef;
}
for my $line (@newdata)
{
print HOSTS "$line\n";
}
close( HOSTS );
}