Changeset 349

Timestamp:

04/03/08 10:55:27 (5 years ago)

Author:

bruno

Message:

First working steps for setupvm

File:

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

devel/pb/bin/pb

@@ -918 +918 @@
 
     # ssh communication if not VE
+    # should use a hash instead...
     my ($shcmd,$cpcmd,$cptarget,$cp2target);
     if ($cmt ne "ve") {
@@ -1249 +1250 @@
 # 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");
+my ($pbaccount) = pb_conf_get($vtype."login");
 
 if ($vtype eq "vm") {
@@ -1279 +1280 @@
 EOF
 print SCRIPT << "EOF";
-    \$found = 1 if (/^$pbaccount:/);
+    \$found = 1 if (/^$pbaccount->{$ENV{'PBPROJ'}}:/);
 EOF
 print SCRIPT << 'EOF';
@@ -1291 +1292 @@
 EOF
 print SCRIPT << "EOF";
-system "groupadd $pbaccount";
-system "useradd $pbaccount -g $pbaccount -m -d /home/$pbaccount";
+system "groupadd $pbaccount->{$ENV{'PBPROJ'}}";
+system "useradd $pbaccount->{$ENV{'PBPROJ'}} -g $pbaccount->{$ENV{'PBPROJ'}} -m -d /home/$pbaccount->{$ENV{'PBPROJ'}}";
 
 # For pb
-chdir "/home/$pbaccount";
+chdir "/home/$pbaccount->{$ENV{'PBPROJ'}}";
 mkdir ".ssh",0700;
 # Allow those accessing root to access the build account
 copy("\$ENV{'HOME'}/.ssh/authorized_keys",".ssh/authorized_keys");
 chmod 0600,".ssh/authorized_keys";
-system 'chown -R $pbaccount:$pbaccount .ssh';
+system 'chown -R $pbaccount->{$ENV{'PBPROJ'}}:$pbaccount->{$ENV{'PBPROJ'}} .ssh';
 
 EOF
@@ -1313 +1314 @@
 EOF
 print SCRIPT << "EOF";
-    s/^$pbaccount:\!\!:/$pbaccount:*:/;
-    s/^$pbaccount:\!:/$pbaccount:*:/;   #SLES 9 e.g.
+    s/^$pbaccount->{$ENV{'PBPROJ'}}:\!\!:/$pbaccount->{$ENV{'PBPROJ'}}:*:/;
+    s/^$pbaccount->{$ENV{'PBPROJ'}}:\!:/$pbaccount->{$ENV{'PBPROJ'}}:*:/;   #SLES 9 e.g.
 EOF
 print SCRIPT << 'EOF';
@@ -1333 +1334 @@
 EOF
 print SCRIPT << "EOF";
-    next if (/^$pbaccount   /);
+    next if (/^$pbaccount->{$ENV{'PBPROJ'}}   /);
 EOF
 print SCRIPT << 'EOF';
@@ -1342 +1343 @@
 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";
+# This is needed in order to be able to halt the machine from the $pbaccount->{$ENV{'PBPROJ'}} account at least
+print PBOUT "$pbaccount->{$ENV{'PBPROJ'}}   ALL=(ALL) NOPASSWD:ALL\n";
 EOF
 print SCRIPT << 'EOF';
@@ -1368 +1369 @@
 EOF
 
-# Adds pb_distro_init from Project-Builder::Distribution
+# Adds pb_distro_init from ProjectBuilder::Distribution
 foreach my $d (@INC) {
-    my $f = "$d/Project-Builder/Distribution.pm";
+    my $f = "$d/ProjectBuilder/Distribution.pm";
     if (-f "$f") {
         open(PBD,"$f") || die "Unable to open $f";