Changeset 347 in ProjectBuilder

Timestamp:

Apr 3, 2008, 1:18:55 AM (16 years ago)

Author:

Bruno Cornec

Message:

setupvm seems better now

Location:

devel/pb

Files:

• bin/pb (modified) (14 diffs)
• lib/ProjectBuilder/Base.pm (modified) (2 diffs)

devel/pb/bin/pb

@@ -355 +355 @@
 if (defined $opts{'a'}) {
     $pbaccount = $opts{'a'};
+    die "option -a requires a -s script option" if (not defined $pbscript);
 }
 if (defined $opts{'P'}) {
@@ -431 +432 @@
     pb_launchv("vm",$ENV{'PBV'},1);
 } elsif ($action =~ /^setupve$/) {
-    $pbaccount = "root";
     my $pbscript = pb_setup_v("ve");
     pb_script2v($pbscript,"ve");
 } elsif ($action =~ /^setupvm$/) {
-    $pbaccount = "root";
     my $pbscript = pb_setup_v("vm");
     pb_script2v($pbscript,"vm");
@@ -817 +816 @@
 
     # Get the running distro to consider
-    my ($odir,$over,$oarch) = (undef, undef);
+    my ($odir,$over,$oarch) = (undef, undef, undef);
     if (defined $v) {
         ($odir,$over,$oarch) = split(/-/,$v);
@@ -917 +916 @@
     my ($shcmd,$cpcmd,$cptarget,$cp2target);
     if ($cmt ne "ve") {
-        $shcmd = "ssh -q -p $nport $mac";
-        $cpcmd = "scp -p -P $nport";
+        my $keyfile = pb_ssh_get(0);
+        $shcmd = "ssh -i $keyfile -q -p $nport $mac";
+        $cpcmd = "scp -i $keyfile -p -P $nport";
         $cptarget = "$mac:$tdir";
         $cp2target = "$mac:$bdir";
@@ -1169 +1169 @@
     }
     # Gather all required files to send them to the VM/VE
-    # and launch the build thourgh pbscript
+    # and launch the build through pbscript
     pb_send2target($vtype,"$v",$vmexist,$vmpid);
 }
@@ -1244 +1244 @@
 
 # Name of the account to deal with for VM/VE
+# Do not use the one passed potentially with -a
 my $pbaccount = pb_conf_get($vtype."login");
+
+if ($vtype eq "vm") {
+    # Prepare the key to be used and transfered remotely
+    my $keyfile = pb_ssh_get(1);
+    
+    my ($sshhost,$sshport) = pb_conf_get("vmhost","vmport");
+    my $nport = $sshport->{$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");
+    # once this is done, we can do what we want on the VM remotely
+}
 
 # Prepare the script to be executed on the VM/VE
 # in $ENV{'PBDESTDIR'}/setupv
-
-# Check the SSH environment
-my $file = undef;
-$file = "$ENV{'HOME'}/.ssh/id_rsa.pub" if (-s "$ENV{'HOME'}/.ssh/id_rsa.pub");
-$file = "$ENV{'HOME'}/.ssh/id_dsa.pub" if (-s "$ENV{'HOME'}/.ssh/id_dsa.pub");
-die "Unable to find your public ssh key under $file" if (not defined $file);
 
 open(SCRIPT,"> $pbscript") || die "Unable to create $pbscript";
@@ -1286 +1293 @@
 chdir "/home/$pbaccount";
 mkdir ".ssh",0700;
-copy("/tmp/pbkey",".ssh/authorized_keys");
+# Allow those accessing root to access the build account
+copy("\$HOME/.ssh/authorized_keys",".ssh/authorized_keys");
 chmod 0600,".ssh/authorized_keys";
 system 'chown -R $pbaccount:$pbaccount .ssh';
@@ -1294 +1302 @@
 }
 
-# For root
-mkdir ".ssh",0700;
-copy("/tmp/pbkey",".ssh/authorized_keys");
-chmod 0600,".ssh/authorized_keys";
-
-# No passwd for pb only keys
+# No passwd for build account only keys
 $file="/etc/shadow";
 open(PBFILE,$file) || die "Unable to open $file";
@@ -1318 +1321 @@
 
 # pb has to be added to portage group on gentoo
-unlink "/tmp/pbkey";
 
 # Adapt sudoers
@@ -1346 +1348 @@
 EOF
 
-pb_install_pkg_deps(SCRIPT);
+pb_install_deps(SCRIPT);
 
 print SCRIPT << 'EOF';
@@ -1359 +1361 @@
 system "rm -rf project-builder-* ; wget --passive-ftp ftp://ftp.mondorescue.org/src/project-builder-latest.tar.gz ; tar xvfz project-builder-latest.tar.gz ; cd project-builder-* ; perl Makefile.PL ; make ; make install ; cd ..";
 EOF
+
+# Adds pb_distro_init from Project-Builder::Distribution
+foreach my $d (@INC) {
+    my $f = "$d/Project-Builder/Distribution.pm";
+    if (-f "$f") {
+        open(PBD,"$f") || die "Unable to open $f";
+        while (<PBD>) {
+            print SCRIPT $_;
+        }
+        close(PBD);
+        last;
+    }
+}
 close(SCRIPT);
 chmod 0755,"$pbscript";
@@ -1364 +1379 @@
 }
 
-pb_install_pkg_deps {
+sub pb_install_deps {
 
 my \*SCRIPT = shift;
@@ -1370 +1385 @@
 print SCRIPT << 'EOF';
 # We need to have that pb_distro_init function
+# Get it from Project-Builder::Distribution
 my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init(); 
 print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n";
@@ -1409 +1425 @@
 }
 
+# Return the SSH key file to use
+# Potentially create it if needed
+
+sub pb_ssh_get {
+
+my $create = shift || 0;    # Do not create keys by default
+
+# Check the SSH environment
+my $keyfile = undef;
+
+# We have specific keys by default
+$keyfile = "$ENV{'HOME'}/.ssh/pb_dsa";
+if ((-s $keyfile) && ($create eq 1)) {
+    pb_system("ssh-keygen -q -b 1024 -N '' -f $keyfile -t dsa","Generating SSH keys for pb");
+}
+
+$keyfile = "$ENV{'HOME'}/.ssh/id_rsa" if (-s "$ENV{'HOME'}/.ssh/id_rsa");
+$keyfile = "$ENV{'HOME'}/.ssh/id_dsa" if (-s "$ENV{'HOME'}/.ssh/id_dsa");
+$keyfile = "$ENV{'HOME'}/.ssh/pb_dsa" if (-s "$ENV{'HOME'}/.ssh/pb_dsa");
+die "Unable to find your public ssh key under $keyfile" if (not defined $keyfile);
+return($keyfile);
+}
+
+
 # Returns the pid of a running VM command using a specific VM file
 sub pb_check_ps {

devel/pb/lib/ProjectBuilder/Base.pm

@@ -832 +832 @@
 #system("$cmd 2>&1 > $ENV{'PBTMP'}/system.log");
 system($cmd);
-if ($? == -1) {
+my $res = $?;
+if ($res == -1) {
     pb_log(0,"failed to execute ($cmd) : $!\n");
     pb_display_file("$ENV{'PBTMP'}/system.log");
-} elsif ($? & 127) {
+} elsif ($res & 127) {
     pb_log(0, "child ($cmd) died with signal ".($? & 127).", ".($? & 128) ? 'with' : 'without'." coredump\n");
     pb_display_file("$ENV{'PBTMP'}/system.log");
-} elsif ($? == 0) {
+} elsif ($res == 0) {
     pb_log(0,"OK\n");
 } else {
@@ -844 +845 @@
     pb_display_file("$ENV{'PBTMP'}/system.log");
 }
+return($res);
 }