Changeset 1649 in ProjectBuilder for devel/pb

Timestamp:

Sep 27, 2012, 2:29:27 PM (12 years ago)

Author:

Bruno Cornec

Message:

• Add support for redhat 6.2 for pb with setupve

File:

• devel/pb/bin/pb (modified) (5 diffs)

devel/pb/bin/pb

@@ -24 +24 @@
 use File::Copy;
 use File::stat;
-use File::Temp qw(tempdir);
 use File::Find;
 use Time::localtime qw(localtime);
@@ -2270 +2269 @@
     # should use a hash instead...
     my ($shcmd,$shcmdroot,$cpcmd,$cptarget,$cp2target);
+    my $tpdir;
     if ($cmt =~ /^VE/) {
         my $tp = pb_path_expand($vepath->{$ENV{'PBPROJ'}});
-        my $tpdir = pb_path_expand("$tp/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}");
+        $tpdir = pb_path_expand("$tp/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}");
         my ($ptr) = pb_conf_get("vetype");
         my $vetype = $ptr->{$ENV{'PBPROJ'}};
@@ -2342 +2342 @@
     # For VE we need to change the owner manually
     if ($cmt =~ /^VE/) {
-        pb_system("$shcmdroot sed -i '/requiretty/d' /etc/sudoers","Removing potential requiretty in sudoers");
+        my $res = pb_system("$shcmdroot sed -i '/requiretty/d' /etc/sudoers","Removing potential requiretty in sudoers");
+        pb_system("$shcmdroot sed '/requiretty/d' /etc/sudoers > /tmp/sudoers.new ; mv /tmp/sudoers.new $tpdir/tmp/sudoers.new ; $shcmdroot mv /tmp/sudoers.new /etc/sudoers","Removing again potential requiretty in sudoers as sed -i failed") if (($res ne 0) && (-f "$tpdir/etc/sudoers"));
         pb_system("$shcmd \"sudo $chowncommand -R $mac $tdir\"","Adapt owner in $tdir to $mac");
     }
@@ -2521 +2522 @@
     # Keep only the first VM in case many were given
     if ($v =~ /,/) {
-        pb_log(0,"WARNING: pruning to just the first of several vms listed ($v)\n");
+        pb_log(0,"WARNING: pruning to just the first of several VM/VE/RMs listed ($v)\n");
         $v =~ s/,.*//;
     }
@@ -3081 +3082 @@
 
 # Define mandatory global vars
-our $pbdebug;
-our $pbLOG;
-our $pbsynmsg = "pbscript";
-our $pbdisplaytype = "text";
-our $pblocale = "";
+EOF
+    my $ppref = "our";
+    $ppref = "my" if (($pbos->{'name'} =~ /redhat/) && ($pbos->{'version'} =~ /^6/));
+    print SCRIPT << "EOF";
+$ppref \$pbdebug;
+$ppref \$pbLOG;
+$ppref \$pbsynmsg = "pbscript";
+$ppref \$pbdisplaytype = "text";
+$ppref \$pblocale = "";
+EOF
+    print SCRIPT << 'EOF';
 pb_log_init($pbdebug, $pbLOG);
 EOF