diff --git a/xCAT-server/share/xcat/tools/xCATreg b/xCAT-server/share/xcat/tools/xCATreg old mode 100644 new mode 100755 index ed71bd173..c98d3fdcb --- a/xCAT-server/share/xcat/tools/xCATreg +++ b/xCAT-server/share/xcat/tools/xCATreg @@ -55,11 +55,7 @@ my $regresultdir = "$regrootdir/regresult"; my $todayregresultdir=""; my $maildir="$regrootdir/mail"; my $mailfile=""; -my $rootdir = "$::XCATROOT/share/xcat/tools/autotest"; -my %confkeys; -my $mail_list = 0; -my $needhelp = 0; -my $branch = "master"; +my $rootdir = "$::XCATROOT/share/xcat/tools/autotest"; my %confkeys; my $mail_list = 0; my $needhelp = 0; my $branch = "master"; my $management_node = undef; #my $verbose_mode = 0; my $updates_regression = 0; @@ -524,7 +520,7 @@ sub copy_code { return 1; } send_msg(2, "[$mn->$confkeys{$mn}][copy_code] copy ISO $iso to $mn successfully"); - system ("sed -i 's|ISO=/\\S*|ISO=/$iso|g' $configfiledir/$regconf"); + system ("sed -i 's|^ISO=/\\S*|ISO=/$iso|g' $configfiledir/$regconf"); } if($mn =~ /sles/){ @@ -548,7 +544,7 @@ sub copy_code { return 1; } send_msg(2, "[$mn->$confkeys{$mn}][copy_code] copy ISO $iso to $mn successfully"); - system ("sed -i 's|ISO=/\\S*|ISO=/$iso|g' $configfiledir/$regconf"); + system ("sed -i 's|^ISO=/\\S*|ISO=/$iso|g' $configfiledir/$regconf"); if($os =~ /sles11/){ $res = system("xdsh $confkeys{$mn} \"mv /usr/lib/rpm/find-requires /usr/lib/rpm/find-requires.org\" && scp $osisodir/find-requires $confkeys{$mn}:/usr/lib/rpm/ > /dev/null"); @@ -581,7 +577,7 @@ sub copy_code { return 1; } send_msg(2, "[$mn->$confkeys{$mn}][copy_code] copy ISO $iso to $mn successfully"); - system ("sed -i 's|ISO=/\\S*|ISO=/$iso|g' $configfiledir/$regconf"); + system ("sed -i 's|^ISO=/\\S*|ISO=/$iso|g' $configfiledir/$regconf"); } return 0; }