Changeset 1352

Timestamp:

10/30/11 10:36:43 (20 months ago)

Author:

bruno

Message:

r4384@localhost: bruno | 2011-10-30 01:28:14 +0200

• Change pb_ve_launch interface (remove useless second parameter)
• Force call to pb_ve_launch with pbforce to always create the chroot in pbmkbm

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (1 diff)
• pb-modules/lib/ProjectBuilder/VE.pm (modified) (2 diffs)
• pb/bin/pb (modified) (1 diff)
• pbmkbm/bin/pbmkbm (modified) (3 diffs)

devel/pb-modules/etc/pb.conf

@@ -364 +364 @@
 #
 mkbmpath default = /var/cache/pbmkbm
-vetype pbmkpb = chroot
+vetype pbmkbm = chroot
+verpmtype pbmkbm = rpmbootstrap
+vedebtype pbmkbm = debbootstrap
 
 # pb install dependencies per distro

devel/pb-modules/lib/ProjectBuilder/VE.pm

@@ -62 +62 @@
 
 my $v = shift || undef;
-my $create = shift || 0;        # By default do not create a VM/VE/RM
 my $pbforce = shift || 0;       # By default do not rebuild VE
 my $pbsnap = shift || 0;        # By default do not snap VE
@@ -73 +72 @@
 my $vetype = $ptr->{$ENV{'PBPROJ'}};
 
-# We can probably only get those params now we have the distro context
-my ($rbsb4pi,$rbspi,$vesnap,$oscodename,$osmindep,$verebuild,$rbsmirrorsrv) = pb_conf_get_if("rbsb4pi","rbspi","vesnap","oscodename","osmindep","verebuild","rbsmirrorsrv");
-
-# We need to avoid umask propagation to the VE
-umask 0022;
-
-# If we are already root (from pbmkbm e.g.) don't use sudo, just call the command
-my $sudocmd="";
-$sudocmd ="sudo " if ($EFFECTIVE_USER_ID != 0);
-
-my $arch = pb_get_arch();
-
 if (($vetype eq "chroot") || ($vetype eq "schroot")) {
+
+    # We need to avoid umask propagation to the VE
+    umask 0022;
+
+    # We can probably only get those params now we have the distro context
+    my ($rbsb4pi,$rbspi,$vesnap,$oscodename,$osmindep,$verebuild,$rbsmirrorsrv) = pb_conf_get_if("rbsb4pi","rbspi","vesnap","oscodename","osmindep","verebuild","rbsmirrorsrv");
+
     # Architecture consistency
+    my $arch = pb_get_arch();
     if ($arch ne $pbos->{'arch'}) {
         die "Unable to launch a VE of architecture $pbos->{'arch'} on a $arch platform" if (($pbos->{'arch'} eq "x86_64") && ($arch =~ /i?86/));
     }
 
-    my ($verpmtype,$vedebtype) = pb_conf_get("verpmtype","vedebtype");
-    if (($create != 0) || ((defined $verebuild) && ($verebuild->{$ENV{'PBPROJ'}} =~ /true/i)) || ($pbforce == 1)) {
-    my ($rbsopt1) = pb_conf_get_if("rbsopt");
+    # If we are already root (from pbmkbm e.g.) don't use sudo, just call the command
+    my $sudocmd="";
+    $sudocmd ="sudo " if ($EFFECTIVE_USER_ID != 0);
+
+    if (((defined $verebuild) && ($verebuild->{$ENV{'PBPROJ'}} =~ /true/i)) || ($pbforce == 1)) {
+        my ($verpmtype,$vedebtype) = pb_conf_get("verpmtype","vedebtype");
+        my ($rbsopt1) = pb_conf_get_if("rbsopt");
 
         # We have to rebuild the chroot

devel/pb/bin/pb

@@ -2208 +2208 @@
         return($vmexist,$vmpid);
     } elsif ($vtype eq "ve") {
-        pb_ve_launch($v,$create,$pbforce,$pbsnap);
+        pb_ve_launch($v,$pbforce,$pbsnap);
     } else {
         # RM here

devel/pbmkbm/bin/pbmkbm

@@ -296 +296 @@
 if ($opts{'b'} eq "ve") {
     # Use existing tools to create a good VE !
-    pb_ve_launch($ENV{'PBV'});
+    pb_ve_launch($ENV{'PBV'},1);
 } elsif ($opts{'b'} eq "native") {
     # Use native tools to create a good VE !
@@ -302 +302 @@
     die "Unknown method $opts{'b'} used to create the media content";
 }
+
+# Once the environment is made, add what is needed for this boot media to it.
 }
 
@@ -310 +312 @@
 # Get the package list to download, store them in a cache directory
 #
-my ($mkbmcachedir) = pb_conf_get_if("mkbmcachedir");
-my ($pkgs) = pb_distro_get_param($pbos,pb_conf_get("mkbmmindep"));
+#my ($mkbmcachedir) = pb_conf_get_if("mkbmcachedir");
+#my ($pkgs) = pb_distro_get_param($pbos,pb_conf_get("mkbmmindep"));
 
 #
 # /proc needed
 #
-pb_system("mount -o bind /proc $targetdir/proc","Mounting /proc");
+#pb_system("mount -o bind /proc $targetdir/proc","Mounting /proc");
 
 # Installed additional packages we were asked to
-if (defined $opts{'a'}) {
-    $opts{'a'} =~ s/,/ /g;
-    pb_system("chroot $targetdir /bin/bash -c \"$pbos->{'install'} $opts{'a'} \"","Adding packages to OS by running $pbos->{'install'} $opts{'a'}");
-}
+#if (defined $opts{'a'}) {
+#$opts{'a'} =~ s/,/ /g;
+#pb_system("chroot $targetdir /bin/bash -c \"$pbos->{'install'} $opts{'a'} \"","Adding packages to OS by running $pbos->{'install'} $opts{'a'}");
+#}
 
 #
 # Clean up
 #
-pb_log(1,"Cleaning up\n");
-pb_system("umount $targetdir/proc","Unmounting /proc");
+#pb_log(1,"Cleaning up\n");
+#pb_system("umount $targetdir/proc","Unmounting /proc");
 
 # Executes post-install step if asked for
-if ($opts{'s'}) {
-    pb_system("$opts{'s'} $targetdir","Executing the post-install script: $opts{'s'} $targetdir");
-}
+#if ($opts{'s'}) {
+#pb_system("$opts{'s'} $targetdir","Executing the post-install script: $opts{'s'} $targetdir");
+#}