merge 13125 to branch

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@13423 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
daniceexi 2012-08-03 09:20:28 +00:00
parent 1a0f0a90b0
commit 41fbf85cb8

View File

@ -4133,6 +4133,9 @@ sub clicmds {
$curruser="USERID";
$currpass = "PASSW0RD";
$nokeycheck=1;
} else {
if ($args{curruser}) { $curruser = $args{curruser}; $nokeycheck=1; }
if ($args{currpass}) { $currpass = $args{currpass}; $nokeycheck=1; }
}
if ($args{nokeycheck}) {
$nokeycheck=1;