Changeset 348 in ProjectBuilder

Timestamp:

Apr 3, 2008, 2:23:49 AM (16 years ago)

Author:

Bruno Cornec

Message:

• setupvm structure OK
• Fix "Script" target

File:

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

devel/pb/bin/pb

@@ -337 +337 @@
 if (defined $opts{'l'}) {
     open(LOG,"> $opts{'l'}") || die "Unable to log to $opts{'l'}: $!";
-    $LOG = *LOG;
+    $LOG = \*LOG;
     $debug = 0  if ($debug == -1);
     }
@@ -433 +433 @@
 } elsif ($action =~ /^setupve$/) {
     my $pbscript = pb_setup_v("ve");
+    # That buil script needs to be run as root
+    $pbaccount = "root";
     pb_script2v($pbscript,"ve");
 } elsif ($action =~ /^setupvm$/) {
     my $pbscript = pb_setup_v("vm");
+    # That buil script needs to be run as root
+    $pbaccount = "root";
     pb_script2v($pbscript,"vm");
 } elsif ($action =~ /^newproj$/) {
@@ -792 +796 @@
     my $conf = "sshconf";
     my $rebuild = "sshrebuild";
-    if ($cmt eq "vm") {
+    if (($cmt eq "vm") || ($cmt eq "Script")) {
         $login = "vmlogin";
         $dir = "pbdefdir";
@@ -1251 +1255 @@
     my $keyfile = pb_ssh_get(1);
     
-    my ($sshhost,$sshport) = pb_conf_get("vmhost","vmport");
-    my $nport = $sshport->{$ENV{'PBPROJ'}};
+    my ($vmhost,$vmport) = pb_conf_get("vmhost","vmport");
+    my $nport = $vmport->{$ENV{'PBPROJ'}};
     $nport = "$pbport" if (defined $pbport);
 
-    pb_system("cat $keyfile.pub | ssh -q -p $nport -i $keyfile root\@$sshhost->{$ENV{'PBPROJ'}} \"mkdir .ssh ; chmod 700 .ssh ; cat > .ssh/authorized_keys ; chmod 600 .ssh/authorized_keys\"","Copying local keys to $vtype. This will require the root password");
+    pb_system("cat $keyfile.pub | ssh -q -p $nport -i $keyfile root\@$vmhost->{$ENV{'PBPROJ'}} \"mkdir .ssh ; chmod 700 .ssh ; cat > .ssh/authorized_keys ; chmod 600 .ssh/authorized_keys\"","Copying local keys to $vtype. This will require the root password");
     # once this is done, we can do what we want on the VM remotely
 }
@@ -1274 +1278 @@
 while (<PBFILE>) {
 EOF
-print SCRIPT << "EOF"
+print SCRIPT << "EOF";
     \$found = 1 if (/^$pbaccount:/);
 EOF
@@ -1286 +1290 @@
     }
 EOF
-print SCRIPT << "EOF"
+print SCRIPT << "EOF";
 system "groupadd $pbaccount";
 system "useradd $pbaccount -g $pbaccount -m -d /home/$pbaccount";
@@ -1294 +1298 @@
 mkdir ".ssh",0700;
 # Allow those accessing root to access the build account
-copy("\$HOME/.ssh/authorized_keys",".ssh/authorized_keys");
+copy("\$ENV{'HOME'}/.ssh/authorized_keys",".ssh/authorized_keys");
 chmod 0600,".ssh/authorized_keys";
 system 'chown -R $pbaccount:$pbaccount .ssh';
@@ -1308 +1312 @@
 while (<PBFILE>) {
 EOF
-print SCRIPT << "EOF"
+print SCRIPT << "EOF";
     s/^$pbaccount:\!\!:/$pbaccount:*:/;
     s/^$pbaccount:\!:/$pbaccount:*:/;   #SLES 9 e.g.
 EOF
-print SCRIPT << 'EOF'
+print SCRIPT << 'EOF';
     print PBOUT $_;
 }
@@ -1328 +1332 @@
 while (<PBFILE>) {
 EOF
-print SCRIPT << "EOF"
+print SCRIPT << "EOF";
     next if (/^$pbaccount   /);
 EOF
-print SCRIPT << 'EOF'
+print SCRIPT << 'EOF';
     s/Defaults[ \t]+requiretty//;
     print PBOUT $_;
@@ -1337 +1341 @@
 close(PBFILE);
 EOF
-print SCRIPT << "EOF"
+print SCRIPT << "EOF";
 # This is needed in order to be able to halt the machine from the $pbaccount account at least
 print PBOUT "$pbaccount   ALL=(ALL) NOPASSWD:ALL\n";
 EOF
-print SCRIPT << 'EOF'
+print SCRIPT << 'EOF';
 close(PBOUT);
 rename("$file.new",$file);
@@ -1348 +1352 @@
 EOF
 
-pb_install_deps(SCRIPT);
+my $SCRIPT = \*SCRIPT;
+
+pb_install_deps($SCRIPT);
 
 print SCRIPT << 'EOF';
@@ -1381 +1387 @@
 sub pb_install_deps {
 
-my \*SCRIPT = shift;
-
-print SCRIPT << 'EOF';
+my $SCRIPT = shift;
+
+print {$SCRIPT} << 'EOF';
 # We need to have that pb_distro_init function
 # Get it from Project-Builder::Distribution
@@ -1437 +1443 @@
 # We have specific keys by default
 $keyfile = "$ENV{'HOME'}/.ssh/pb_dsa";
-if ((-s $keyfile) && ($create eq 1)) {
+if (!(-e $keyfile) && ($create eq 1)) {
     pb_system("ssh-keygen -q -b 1024 -N '' -f $keyfile -t dsa","Generating SSH keys for pb");
 }