Changeset 1029 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

May 21, 2010, 9:59:59 PM (14 years ago)

Author:

Bruno Cornec

Message:

• Fix umask propagation in VE, fixing issues in directory creation with wrong rights
• Remove the useless vemindep option and fix ospkgdep accordingly
• Fix the rights for the dev dir in rpmbootstrap

File:

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

devel/pb/bin/pb

@@ -1748 +1748 @@
         my ($rbsb4pi,$rbspi,$vesnap,$oscodename,$osmindep,$verebuild) = pb_conf_get_if("rbsb4pi","rbspi","vesnap","oscodename","osmindep","verebuild");
 
+        # We need to avoid umask propagation to the VE
+        umask 0022;
+
         if (($vetype eq "chroot") || ($vetype eq "schroot")) {
             # Architecture consistency
@@ -2249 +2252 @@
         # once this is done, we can do what we want on the VM remotely
     } elsif ($vtype eq "ve") {
-        # We need to finish the setup of packages needed in the VE
-        # rinse/debootstrap at least needs it
-        my ($vemindep) = pb_conf_get_if("vemindep");
-
-        my $postparam = "";
-        if (defined $vemindep) {
-            $postparam .= " ".pb_distro_get_param($ddir,$dver,$darch,$vemindep);
-        }
-        # Change the list of pkg in to a space separated list
-        $postparam =~ s/,/ /g;
-        # remove potential sudo from the update command for this time,
-        # as this will be run as root anyway, and if not we will have
-        # a problem with tty
-        $pbupd =~ s/sudo //g;
-
-            print SCRIPT << "EOF";
+        print SCRIPT << "EOF";
 # 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
-        if ($postparam ne "") {
-            print SCRIPT << "EOF";
+        print SCRIPT << "EOF";
 # For VE we first need to mount some FS
 pb_system("mount -t proc /proc /proc");
 
-# For VE we need some additional packages that are not there yet
-pb_system("$pbupd $postparam");
-
-EOF
-        }
-    }
-    if ($vtype eq "vm") {
+EOF
+    }
+
+if ($vtype eq "vm") {
         print SCRIPT << 'EOF';
 # Removes duplicate in .ssh/authorized_keys of our key if needed