Changeset 1352 in ProjectBuilder
- Timestamp:
- Oct 30, 2011, 10:36:43 AM (12 years ago)
- Location:
- devel
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/etc/pb.conf
r1350 r1352 364 364 # 365 365 mkbmpath default = /var/cache/pbmkbm 366 vetype pbmkpb = chroot 366 vetype pbmkbm = chroot 367 verpmtype pbmkbm = rpmbootstrap 368 vedebtype pbmkbm = debbootstrap 367 369 368 370 # pb install dependencies per distro -
devel/pb-modules/lib/ProjectBuilder/VE.pm
r1350 r1352 62 62 63 63 my $v = shift || undef; 64 my $create = shift || 0; # By default do not create a VM/VE/RM65 64 my $pbforce = shift || 0; # By default do not rebuild VE 66 65 my $pbsnap = shift || 0; # By default do not snap VE … … 73 72 my $vetype = $ptr->{$ENV{'PBPROJ'}}; 74 73 75 # We can probably only get those params now we have the distro context76 my ($rbsb4pi,$rbspi,$vesnap,$oscodename,$osmindep,$verebuild,$rbsmirrorsrv) = pb_conf_get_if("rbsb4pi","rbspi","vesnap","oscodename","osmindep","verebuild","rbsmirrorsrv");77 78 # We need to avoid umask propagation to the VE79 umask 0022;80 81 # If we are already root (from pbmkbm e.g.) don't use sudo, just call the command82 my $sudocmd="";83 $sudocmd ="sudo " if ($EFFECTIVE_USER_ID != 0);84 85 my $arch = pb_get_arch();86 87 74 if (($vetype eq "chroot") || ($vetype eq "schroot")) { 75 76 # We need to avoid umask propagation to the VE 77 umask 0022; 78 79 # We can probably only get those params now we have the distro context 80 my ($rbsb4pi,$rbspi,$vesnap,$oscodename,$osmindep,$verebuild,$rbsmirrorsrv) = pb_conf_get_if("rbsb4pi","rbspi","vesnap","oscodename","osmindep","verebuild","rbsmirrorsrv"); 81 88 82 # Architecture consistency 83 my $arch = pb_get_arch(); 89 84 if ($arch ne $pbos->{'arch'}) { 90 85 die "Unable to launch a VE of architecture $pbos->{'arch'} on a $arch platform" if (($pbos->{'arch'} eq "x86_64") && ($arch =~ /i?86/)); 91 86 } 92 87 93 my ($verpmtype,$vedebtype) = pb_conf_get("verpmtype","vedebtype"); 94 if (($create != 0) || ((defined $verebuild) && ($verebuild->{$ENV{'PBPROJ'}} =~ /true/i)) || ($pbforce == 1)) { 95 my ($rbsopt1) = pb_conf_get_if("rbsopt"); 88 # If we are already root (from pbmkbm e.g.) don't use sudo, just call the command 89 my $sudocmd=""; 90 $sudocmd ="sudo " if ($EFFECTIVE_USER_ID != 0); 91 92 if (((defined $verebuild) && ($verebuild->{$ENV{'PBPROJ'}} =~ /true/i)) || ($pbforce == 1)) { 93 my ($verpmtype,$vedebtype) = pb_conf_get("verpmtype","vedebtype"); 94 my ($rbsopt1) = pb_conf_get_if("rbsopt"); 96 95 97 96 # We have to rebuild the chroot -
devel/pb/bin/pb
r1350 r1352 2208 2208 return($vmexist,$vmpid); 2209 2209 } elsif ($vtype eq "ve") { 2210 pb_ve_launch($v,$ create,$pbforce,$pbsnap);2210 pb_ve_launch($v,$pbforce,$pbsnap); 2211 2211 } else { 2212 2212 # RM here -
devel/pbmkbm/bin/pbmkbm
r1350 r1352 296 296 if ($opts{'b'} eq "ve") { 297 297 # Use existing tools to create a good VE ! 298 pb_ve_launch($ENV{'PBV'} );298 pb_ve_launch($ENV{'PBV'},1); 299 299 } elsif ($opts{'b'} eq "native") { 300 300 # Use native tools to create a good VE ! … … 302 302 die "Unknown method $opts{'b'} used to create the media content"; 303 303 } 304 305 # Once the environment is made, add what is needed for this boot media to it. 304 306 } 305 307 … … 310 312 # Get the package list to download, store them in a cache directory 311 313 # 312 my ($mkbmcachedir) = pb_conf_get_if("mkbmcachedir");313 my ($pkgs) = pb_distro_get_param($pbos,pb_conf_get("mkbmmindep"));314 #my ($mkbmcachedir) = pb_conf_get_if("mkbmcachedir"); 315 #my ($pkgs) = pb_distro_get_param($pbos,pb_conf_get("mkbmmindep")); 314 316 315 317 # 316 318 # /proc needed 317 319 # 318 pb_system("mount -o bind /proc $targetdir/proc","Mounting /proc");320 #pb_system("mount -o bind /proc $targetdir/proc","Mounting /proc"); 319 321 320 322 # Installed additional packages we were asked to 321 if (defined $opts{'a'}) {322 323 324 }323 #if (defined $opts{'a'}) { 324 #$opts{'a'} =~ s/,/ /g; 325 #pb_system("chroot $targetdir /bin/bash -c \"$pbos->{'install'} $opts{'a'} \"","Adding packages to OS by running $pbos->{'install'} $opts{'a'}"); 326 #} 325 327 326 328 # 327 329 # Clean up 328 330 # 329 pb_log(1,"Cleaning up\n");330 pb_system("umount $targetdir/proc","Unmounting /proc");331 #pb_log(1,"Cleaning up\n"); 332 #pb_system("umount $targetdir/proc","Unmounting /proc"); 331 333 332 334 # Executes post-install step if asked for 333 if ($opts{'s'}) {334 335 }335 #if ($opts{'s'}) { 336 #pb_system("$opts{'s'} $targetdir","Executing the post-install script: $opts{'s'} $targetdir"); 337 #}
Note:
See TracChangeset
for help on using the changeset viewer.