Changeset 1541 in ProjectBuilder for devel/pb/bin

Timestamp:

May 14, 2012, 2:41:55 AM (13 years ago)

Author:

Bruno Cornec

Message:

• pb: Update to make the port and login optional config entries. Add more places where we use pb_path_expand so that $ENV{HOME} is properly expanded. Add more documentation to pb_setup2v. Error out on an unknown vtype. Fix code so that the http_proxy/ftp_proxy are kept for the root user as well as the build user. Apply new {ftp,http}_proxy options. (Eric Anderson)

File:

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

devel/pb/bin/pb

@@ -1794 +1794 @@
     pb_log(0,"Sources handled ($cmt): $src\n");
     pb_log(2,"values: ".Dumper(($host,$login,$dir,$port,$tmout,$path,$conf))."\n");
-    my ($sshhost,$sshlogin,$sshdir,$sshport) = pb_conf_get($host,$login,$dir,$port);
+    my ($sshhost,$sshdir) = pb_conf_get($host,$dir);
     # Not mandatory...
     $delivery->{$ENV{'PBPROJ'}} = "" if (not defined $delivery->{$ENV{'PBPROJ'}});
+    my ($sshlogin,$sshport) = pb_conf_get_if($login,$port);
+    $sshport->{$ENV{PBPROJ}} = 22 unless (defined $sshport->{$ENV{PBPROJ}});
+    $sshlogin->{$ENV{PBPROJ}} = getpwuid($UID) unless (defined $sshlogin->{$ENV{PBPROJ}});
     my ($vtmout,$vepath);
     # ...Except those in virtual context
@@ -2059 +2062 @@
     my ($shcmd,$cpcmd,$cptarget,$cp2target);
     if ($cmt =~ /^VE/) {
-        my $tp = $vepath->{$ENV{'PBPROJ'}};
-        my $tpdir = "$tp/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}";
+        my $tp = pb_path_expand($vepath->{$ENV{'PBPROJ'}});
+        my $tpdir = pb_path_expand("$tp/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}");
         my ($ptr) = pb_conf_get("vetype");
         my $vetype = $ptr->{$ENV{'PBPROJ'}};
@@ -2070 +2073 @@
         $cpcmd = "sudo /bin/cp -r ";
         # We need to get the home dir of the target account to deliver in the right place
-        open(PASS,"$tpdir/etc/passwd") || die "Unable to open $tpdir/etc/passwd";
+        open(PASS,"$tpdir/etc/passwd") || die "Unable to open $tpdir/etc/passwd: $!";
         my $homedir = "";
         while (<PASS>) {
@@ -2770 +2773 @@
 }
 
+# This function creates a giant script to configure a particular VM/VE/RM, it then copies the 
+# script to the target.
+
 # Function to create a potentialy missing pb account on the VM/VE/RM, and adds it to sudo
 # Needs to use root account to connect to the VM/VE/RM
@@ -2874 +2880 @@
 # For VE we need a good null dev
 pb_system("rm -f /dev/null; mknod /dev/null c 1 3; chmod 777 /dev/null");
-EOF
-        print SCRIPT << "EOF";
+
 # For VE we first need to mount some FS
 pb_system("mount -t proc /proc /proc");
 
 EOF
+    } else {
+        die "Unknown virtual type $vtype";
     }
 
@@ -3030 +3037 @@
     next if (/^Defaults:$pbac->{$ENV{'PBPROJ'}}\\s+/);
     next if (/^Defaults:root \!requiretty/);
+    next if (/^Defaults:root env_keep/);
 EOF
     print SCRIPT << 'EOF';
@@ -3043 +3051 @@
 # Keep proxy configuration while using sudo
 print PBOUT "Defaults:$pbac->{$ENV{'PBPROJ'}}    env_keep += \\\"http_proxy ftp_proxy\\\"\n";
+print PBOUT "Defaults:root    env_keep += \\\"http_proxy ftp_proxy\\\"\n";
 EOF
     # Try to restrict security to what is really needed
@@ -3083 +3092 @@
     }
     # We may need a proxy configuration. Get it from the local env
+
+    # TODO: make this apply to the bootstrapping also.
+    my ($ftp_proxy_map, $http_proxy_map) = pb_conf_get_if('ftp_proxy', 'http_proxy');
+    my $ftp_proxy = pb_distro_get_param($pbos, $ftp_proxy_map);
+    my $http_proxy = pb_distro_get_param($pbos, $http_proxy_map);
+
+    $ENV{'ftp_proxy'} = $ftp_proxy if ((defined $ftp_proxy) && ($ftp_proxy ne ''));
+    $ENV{'http_proxy'} = $http_proxy if ((defined $http_proxy) && ($http_proxy ne ''));
 
     if (defined $ENV{'http_proxy'}) {