From 6cd35e6f9cfe721bba48052d0c3abdf485407fe8 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Wed, 4 Apr 2012 19:28:14 +0000 Subject: [PATCH] Instead of pestering user, when CMM is detected auto-switch behavior git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12121 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/blade.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/blade.pm b/xCAT-server/lib/xcat/plugins/blade.pm index f551ee505..e45920619 100644 --- a/xCAT-server/lib/xcat/plugins/blade.pm +++ b/xCAT-server/lib/xcat/plugins/blade.pm @@ -4107,7 +4107,7 @@ sub clicmds { } if ($reset) { $t->cmd("reset -T system:$mm"); - push @result, "The management module has been reset to load the configuration"; + push @data, "The management module has been reset to load the configuration"; } $t->close; return([$Rc,\@unhandled,\@data]); @@ -4568,7 +4568,8 @@ sub snmpcfg { # Check the type of mm my @data = $t->cmd("info -T system:$mm"); if (grep(/Mach type\/model: Chassis Management Module/, @data) && $mptype ne "cmm") { - return ([1,"The hwtype attribute should be set to \'cmm\' for a Chassis Management Module."]); + $mptype="cmm"; + #return ([1,"The hwtype attribute should be set to \'cmm\' for a Chassis Management Module."]); } # Query users on MM my $id; @@ -4634,7 +4635,8 @@ sub sshcfg { # Check the type of mm @data = $t->cmd("info -T system:$mm"); if (grep(/Mach type\/model: Chassis Management Module/, @data) && $mptype ne "cmm") { - return ([1,"The hwtype attribute should be set to \'cmm\' for a Chassis Management Module."]); + #return ([1,"The hwtype attribute should be set to \'cmm\' for a Chassis Management Module."]); + $mptype="cmm"; #why in the world wouldn't we have just done this from the get go???? } # Get firmware version on MM