Changeset 1348 in ProjectBuilder

Timestamp:

Oct 26, 2011, 11:28:44 AM (12 years ago)

Author:

Bruno Cornec

Message:

r4374@localhost: bruno | 2011-10-25 12:10:59 +0200

• Add mkbmpath parameter and document it
• Create a new VE.pm module to host pb_ve_launch (from pb code now reusable for pbmkbm)

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (1 diff)
• pb-modules/etc/pb.conf.pod (modified) (1 diff)
• pb-modules/lib/ProjectBuilder/Env.pm (modified) (1 diff)
• pb-modules/lib/ProjectBuilder/VE.pm (added)
• pb/bin/pb (modified) (5 diffs)
• pbmkbm/bin/pbmkbm (modified) (10 diffs)

devel/pb-modules/etc/pb.conf

@@ -358 +358 @@
 #rbsmirrorsrv debian = http://ftp.us.debian.org/debian/
 #rbsmirrorsrv ubuntu = http://us.releases.ubuntu.com/releases/
+#
+
+#
+# pbmkbm configuration parameters
+#
+mkbmpath default = /var/cache/pbmkbm
 
 # pb install dependencies per distro

devel/pb-modules/etc/pb.conf.pod

@@ -54 +54 @@
  Conffile: project
  Example: filteredfiles mindi = rootfs/sbin/init,mindi,install.sh,doc/mindi.8
+
+=item B<mkbmpath>
+
+ Nature: Mandatory
+ Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here.
+ Value: path of the temporary directory into which the boot media is created.
+ Conffile: pb
+ Example: mkbmpath default = /var/cache/pbmkbm
 
 =item B<namingtype>

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

@@ -59 +59 @@
 sub pb_env_init_pbrc {
 
-# if sudo, then get the real id of the user laucnhing the context 
+# if sudo, then get the real id of the user launching the context 
 # to point to the right conf file
 # Mandatory for rpmbootstrap calls

devel/pb/bin/pb

@@ -36 +36 @@
 use ProjectBuilder::Filter;
 use ProjectBuilder::Changelog;
+use ProjectBuilder::VE;
 
 # Global variables
@@ -2069 +2070 @@
     my $create = shift || 0;        # By default do not create a VM/VE/RM
     my $snapme = shift || 0;        # By default do not snap a VM/VE/RM
+    my $usesnap = shift || 1;       # By default study the usage of the snapshot feature of VM/VE/RM    my $create = shift || 0;        # By default do not create a VM/VE/RM
+    my $snapme = shift || 0;        # By default do not snap a VM/VE/RM
     my $usesnap = shift || 1;       # By default study the usage of the snapshot feature of VM/VE/RM
+
 
     # If creation or snapshot creation mode, no snapshot usable
@@ -2082 +2086 @@
 
     my $pbos = pb_distro_get_context($v);
-    my $arch = pb_get_arch();
-
+    
     # Launch the VMs/VEs
     if ($vtype eq "vm") {
@@ -2209 +2212 @@
         return($vmexist,$vmpid);
     } elsif ($vtype eq "ve") {
-        # VE here
-        # Get distro context
-        my $pbos = pb_distro_get_context($v);
-
-        # Get VE context
-        my ($ptr,$vepath) = pb_conf_get("vetype","vepath");
-        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 (($vetype eq "chroot") || ($vetype eq "schroot")) {
-            # Architecture consistency
-            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");
-
-                # We have to rebuild the chroot
-                if ($pbos->{'type'} eq "rpm") {
-
-                    # Which tool is used
-                    my $verpmstyle = $verpmtype->{$ENV{'PBPROJ'}};
-
-                    # Get potential rbs option
-                    my $rbsopt = "";
-                    if (defined $rbsopt1) {
-                        if (defined $rbsopt1->{$verpmstyle}) {
-                            $rbsopt = $rbsopt1->{$verpmstyle};
-                        } elsif (defined $rbsopt1->{$ENV{'PBPROJ'}}) {
-                            $rbsopt = $rbsopt1->{$ENV{'PBPROJ'}};
-                        } else {
-                            $rbsopt = "";
-                        }
-                    }
-
-                    my $postinstall = pb_get_postinstall($pbos,$rbspi,$verpmstyle);
-                    if ($verpmstyle eq "rinse") {
-                        # Need to reshape the mirrors generated with local before-post-install script
-                        my $b4post = "--before-post-install ";
-                        my $postparam = pb_distro_get_param($pbos,$rbsb4pi);
-                        if ($postparam eq "") {
-                            $b4post = "";
-                        } else {
-                            $b4post .= $postparam;
-                        }
-
-                        # Need to reshape the package list for pb
-                        my $addpkgs;
-                        $postparam = "";
-                        $postparam .= pb_distro_get_param($pbos,$osmindep);
-                        if ($postparam eq "") {
-                            $addpkgs = "";
-                        } else {
-                            my $pkgfile = "$ENV{'PBTMP'}/addpkgs.lis";
-                            open(PKG,"> $pkgfile") || die "Unable to create $pkgfile";
-                            foreach my $p (split(/,/,$postparam)) {
-                                print PKG "$p\n";
-                            }
-                            close(PKG);
-                            $addpkgs = "--add-pkg-list $pkgfile";
-                        }
-
-                        my $rinseverb = "";
-                        $rinseverb = "--verbose" if ($pbdebug gt 0);
-                        my ($rbsconf) = pb_conf_get("rbsconf");
-
-                        my $command = pb_check_req("rinse",0);
-                        pb_system("sudo $command --directory \"$vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}\" --arch \"$pbos->{'arch'}\" --distribution \"$pbos->{'name'}-$pbos->{'version'}\" --config \"$rbsconf->{$ENV{'PBPROJ'}}\" $b4post $postinstall $rbsopt $addpkgs $rinseverb","Creating the rinse VE for $pbos->{'name'}-$pbos->{'version'} ($pbos->{'arch'})", "verbose");
-                    } elsif ($verpmstyle eq "rpmbootstrap") {
-                        my $rbsverb = "";
-                        foreach my $i (1..$pbdebug) {
-                            $rbsverb .= " -v";
-                        }
-                        my $addpkgs = "";
-                        my $postparam = "";
-                        $postparam .= pb_distro_get_param($pbos,$osmindep);
-                        if ($postparam eq "") {
-                            $addpkgs = "";
-                        } else {
-                            $addpkgs = "-a $postparam";
-                        }
-                        my $command = pb_check_req("rpmbootstrap",0);
-                        pb_system("sudo $command $rbsopt $postinstall $addpkgs $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} $rbsverb","Creating the rpmbootstrap VE for $pbos->{'name'}-$pbos->{'version'} ($pbos->{'arch'})", "verbose");
-                    } elsif ($verpmstyle eq "mock") {
-                        my ($rbsconf) = pb_conf_get("rbsconf");
-                        my $command = pb_check_req("mock",0);
-                        pb_system("sudo $command --init --resultdir=\"/tmp\" --configdir=\"$rbsconf->{$ENV{'PBPROJ'}}\" -r $v $rbsopt","Creating the mock VE for $pbos->{'name'}-$pbos->{'version'} ($pbos->{'arch'})");
-                        # Once setup we need to install some packages, the pb account, ...
-                        pb_system("sudo $command --install --configdir=\"$rbsconf->{$ENV{'PBPROJ'}}\" -r $v su","Configuring the mock VE");
-                    } else {
-                        die "Unknown verpmtype type $verpmstyle. Report to dev team";
-                    }
-                } elsif ($pbos->{'type'} eq "deb") {
-                    my $vedebstyle = $vedebtype->{$ENV{'PBPROJ'}};
-
-                    my $codename = pb_distro_get_param($pbos,$oscodename);
-                    my $postparam = "";
-                    my $addpkgs;
-                    $postparam .= pb_distro_get_param($pbos,$osmindep);
-                    if ($postparam eq "") {
-                        $addpkgs = "";
-                    } else {
-                        $addpkgs = "--include $postparam";
-                    }
-                    my $debmir = "";
-                    $debmir .= pb_distro_get_param($pbos,$rbsmirrorsrv);
-
-                    # Get potential rbs option
-                    my $rbsopt = "";
-                    if (defined $rbsopt1) {
-                        if (defined $rbsopt1->{$vedebstyle}) {
-                            $rbsopt = $rbsopt1->{$vedebstyle};
-                        } elsif (defined $rbsopt1->{$ENV{'PBPROJ'}}) {
-                            $rbsopt = $rbsopt1->{$ENV{'PBPROJ'}};
-                        } else {
-                            $rbsopt = "";
-                        }
-                    }
-    
-                    # debootstrap works with amd64 not x86_64
-                    my $debarch = $pbos->{'arch'};
-                    $debarch = "amd64" if ($pbos->{'arch'} eq "x86_64");
-                    if ($vedebstyle eq "debootstrap") {
-                        my $dbsverb = "";
-                        $dbsverb = "--verbose" if ($pbdebug gt 0);
-
-                        # Some perl modules are in Universe on Ubuntu
-                        $rbsopt .= " --components=main,universe" if ($pbos->{'name'} eq "ubuntu");
-
-                        pb_system("sudo /usr/sbin/debootstrap $dbsverb $rbsopt --arch=$debarch $addpkgs $codename \"$vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}\" $debmir","Creating the debootstrap VE for $pbos->{'name'}-$pbos->{'version'} ($pbos->{'arch'})", "verbose");
-                        # debootstrap doesn't create an /etc/hosts file
-                        if (! -f "$vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/etc/hosts" ) {
-                            pb_system("sudo cp /etc/hosts $vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/etc/hosts");
-                        }
-                    } else {
-                        die "Unknown vedebtype type $vedebstyle. Report to dev team";
-                    }
-                } elsif ($pbos->{'type'} eq "ebuild") {
-                    die "Please teach the dev team how to build gentoo chroot";
-                } else {
-                    die "Unknown distribution type $pbos->{'type'}. Report to dev team";
-                }
-            }
-            # Fix modes to allow access to the VE for pb user
-            pb_system("sudo chmod 755 $vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'} $vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'} $vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}","Fixing permissions");
-
-            # Test if an existing snapshot exists and use it if appropriate
-            # And also use it of no local extracted VE is present
-            if ((-f "$vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.tar.gz") &&
-                (((defined $vesnap->{$v}) && ($vesnap->{$v} =~ /true/i)) ||
-                    ((defined $vesnap->{$ENV{'PBPROJ'}}) && ($vesnap->{$ENV{'PBPROJ'}} =~ /true/i)) ||
-                    ($pbsnap eq 1) ||
-                    (! -d "$vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}"))) {
-                        pb_system("sudo rm -rf $vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'} ; sudo mkdir -p $vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'} ; sudo tar xz  -C $vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'} -f $vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.tar.gz","Extracting snapshot of $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.tar.gz under $vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}");
-            }
-            # Nothing more to do for VE. No real launch
-        } else {
-            die "VE of type $vetype not supported. Report to the dev team";
-        }
+        pb_ve_launch($v,$create,$pbforce,$pbsnap);
     } else {
         # RM here
@@ -3678 +3516 @@
 }
 
-#
-# Return the postinstall line if needed
-#
-
-sub pb_get_postinstall {
-
-my $pbos = shift;
-my $rbspi = shift;
-my $vestyle = shift;
-my $post = "";
-
-# Do we have a local post-install script
-if ($vestyle eq "rinse") {
-    $post = "--post-install ";
-} elsif ($vestyle eq "rpmbootstrap") {
-    $post = "-s ";
-}
-
-my $postparam = pb_distro_get_param($pbos,$rbspi);
-if ($postparam eq "") {
-    $post = "";
-} else {
-    $post .= $postparam;
-}
-return($post);
-}
-
 # Manages VM/RM SSH port communication
 sub pb_get_port {

devel/pbmkbm/bin/pbmkbm

@@ -21 +21 @@
 use ProjectBuilder::Conf;
 use ProjectBuilder::Distribution;
+use ProjectBuilder::VE;
 
 # Global variables
@@ -50 +51 @@
 Kernel, modules could come either from the local installed system 
 (typically for disaster recovery context) or from a kernel package of a 
-given configuration.
+given configuration or a referenced content.
 Utilities could come from busybox, local utilities or set of packages.
 The root filesystem is made with them. 
 The initrd/initramfs could be made internaly or by calling dracut.
-THe boot config file is generated from analysis content or provided externally.
+The boot config file is generated from analysis content or provided externally.
 
 =head1 SYNOPSIS
 
-pbmkbm [-vhq][-t boot-media-type [-d device]][-m os-ver-arch]
+pbmkbm [-vhq][-t boot-type [-d device]][-b boot-method][-m os-ver-arch]
 [-s script][-a pkg1[,pkg2,...]] [target-dir]
 
-pbmkbm [--verbose][--help][--man][--quiet][--type  boot-media-type [-device device]]
-[--script script][--iso iso][--add pkg1,[pkg2,...]][target-dir]
+pbmkbm [--verbose][--help][--man][--quiet][--type boot-type [--device device]]
+[--machine os-ver-arch][--boot boot-method]
+[--script script][--add pkg1,[pkg2,...]] [target-dir]
 
 =head1 OPTIONS
@@ -84 +86 @@
 Do not print any output.
 
+=item B<-t|--type boot-type>
+
+Type of the boot device to generate. A boot-type can be:
+
+=over 4 
+
+=item B<iso>
+
+Generate an ISO9660 image format (suitable to be burned later on or loopback mounted. Uses isolinux.
+
+=item B<usb>
+
+Generate a USB image format (typically a key of external hard drive). Uses syslinux.
+
+=item B<pxe>
+
+Generate a PXE environement (suitable to be integrated in a PXElinux configuration). Uses pxelinux.
+
+=back
+
+=item B<-d|--device device-file>
+
+Name of the device or file on which you want to create the boot media.
+
+=item B<-b|--boot boot-method>
+
+This is the boot method to use to create the boot media. A boot-method can be:
+
+=over 4 
+
+=item B<native>
+
+Use the tools of the native distribution to create the boot media. No other dependency.
+
+=item B<ve>
+
+Use the project-builder.org virtual environment notion to create the boot media. No other dependency outside of the project.
+
+=item B<busybox>
+
+Use the busybox tool to create the boot media. Cf: L<http://www.busybox.net>
+
+=item B<dracut>
+
+Use the dracut tool to create the boot media. Cf: L<http://www.dracut.net>
+
+=back
+
 =item B<-s|--script script>
 
-Name of the script you want to execute on the related VEs after the installation.
-It is executed in host environment. 
-You can use the chroot command to execute actions in the VE.
+Name of the script you want to execute on the related boot media at the end o the build.
 
 =item B<-a|--add pkg1[,pkg2,...]>
 
-Additional packages to add from the distribution you want to install on the related VE 
-at the end of the chroot build.
+Additional packages to add from the distribution you want to install on the related boot media 
+at the end of the build.
+
+=item B<-m|--machine os-ver-arch>
+
+This is the target tuple operating system-version-architecture for which you want to create the boot media.
 
 =back 
@@ -99 +151 @@
 =head1 ARGUMENTS
 
+target-dir is the directory under which the boot media will be build.
+
 =over 4 
 
-=item B<target-dir>
-
-This is the target directory under which the VE will be created. 
-Created on the fly if needed. 
-If none is given use the default directory hosting VE for project-builder.org 
-(Cf: vepath parameter in $HOME/.pbrc)
-
 =back 
 
 =head1 EXAMPLE
 
-To setup a USB boot media on the /dev/sdb device for a Fedora 12 distribution with an i386 architecture issue:
-
-pbmkbm -t usb -d /dev/sdb -m fedora-12-i386
+To setup a USB busybox based boot media on the /dev/sdb device for a Fedora 12 distribution with an i386 architecture issue:
+
+pbmkbm -t usb -d /dev/sdb -m fedora-12-i386 -b busybox
+
+To setup an ISO image under /tmp for a RHEL 6 x86_64 distribution issue using the native environment:
+
+pbmkbm -t iso -d /tmp -m rhel-6-x86_64 -b ve
 
 =head1 WEB SITES
@@ -153 +204 @@
 
 GetOptions("help|?|h" => \$opts{'h'}, 
-    "man|m" => \$opts{'man'},
+    "man" => \$opts{'man'},
     "verbose|v+" => \$opts{'v'},
     "quiet|q" => \$opts{'q'},
@@ -160 +211 @@
     "machine|m=s" => \$opts{'m'},
     "add|a=s" => \$opts{'a'},
+    "device|d=s" => \$opts{'d'},
+    "type|t=s" => \$opts{'t'},
+    "boot|b=s" => \$opts{'b'},
     "version|V=s" => \$opts{'V'},
 ) || pb_syntax(-1,0);
@@ -184 +238 @@
 # Get VE name
 $ENV{'PBV'} = $opts{'m'};
-die pb_syntax(-1,1) if (not defined $ENV{'PBV'});
-
-die "Needs to be run as root" if ($EFFECTIVE_USER_ID != 0);
 
 #
 # Initialize distribution info from pb conf file
 #
-pb_log(0,"Starting VE build for $ENV{'PBV'}\n");
 my $pbos = pb_distro_get_context($ENV{'PBV'});
+pb_log(0,"Starting boot media build for $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}\n");
+
+pb_env_init_pbrc(); # to get content of HOME/.pbrc
 
 #
@@ -198 +251 @@
 # Create if not existent and use default if none given
 #
-pb_env_init_pbrc(); # to get content of HOME/.pbrc
-my $vepath = shift @ARGV;
+my $targetdir = shift @ARGV;
 
 #
@@ -207 +259 @@
 pb_check_requirements($req,$opt,$appname);
 
-if (not defined $vepath) {
-    my ($vestdpath) = pb_conf_get("vepath");
-    $vepath = "$vestdpath->{'default'}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}" if (defined $vestdpath->{'default'});
-}
-
-die pb_log(0,"No target-dir specified and no default vepath found in $ENV{'PBETC'}\n") if (not defined $vepath);
-
-pb_mkdir_p($vepath) if (! -d $vepath);
-
-#
+# After that we will need root access
+die "$appname needs to be run as root" if ($EFFECTIVE_USER_ID != 0);
+
+#
+# Where is our build target directory
+#
+
+if (not defined $targetdir) {
+    $targetdir = "/var/cache/pbmkbm";
+    my ($vestdpath) = pb_conf_get("mkbmpath");
+    $targetdir = "$vestdpath->{'default'}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}" if (defined $vestdpath->{'default'});
+}
+
+die pb_log(0,"No target-dir specified and no default mkbmpath found in $ENV{'PBETC'}\n") if (not defined $targetdir);
+
+# Point to the right subdir and create it if needed
+pb_mkdir_p($targetdir) if (! -d $targetdir);
+
+
+# Now the preparation is over, we need to do something useful :-)
+# But it all depends on how we're asked to do it.
+#
+# First we need to copy into the target dir all the relevant content
+pb_mkbm_create_content();
+
+# Then we need to package this content in the destination format
+pb_mkbm_create_media();
+
+sub pb_mkbm_create_content {
+
+pb_log(1,"Creating boot media content\n");
+if ($opts{'b'} eq "ve") {
+    # Use existing tools to create a good VE !
+    pb_ve_launch($ENV{'PBV'});
+} elsif ($opts{'b'} eq "native") {
+    # Use native tools to create a good VE !
+} else {
+    die "Unknown method $opts{'b'} used to create the media content";
+}
+}
+
+sub pb_mkbm_create_media {
+
+}
+
 # Get the package list to download, store them in a cache directory
 #
 my ($mkbmcachedir) = pb_conf_get_if("mkbmcachedir");
-my ($pkgs,$mirror) = pb_distro_get_param($pbos,pb_conf_get("mkbmmindep","mkbmmirrorsrv"));
-
-my $cachedir = "/var/cache/pbmkbm";
-$cachedir = $mkbmcachedir->{'default'} if (defined $mkbmcachedir->{'default'});
-
-# Point to the right subdir and create it if needed
-$cachedir .= "/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}";
-pb_mkdir_p($cachedir) if (! -d $cachedir);
+my ($pkgs) = pb_distro_get_param($pbos,pb_conf_get("mkbmmindep"));
 
 #
 # /proc needed
 #
-pb_system("mount -o bind /proc $vepath/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 $vepath /bin/bash -c \"$pbos->{'install'} $opts{'a'} \"","Adding packages to OS by running $pbos->{'install'} $opts{'a'}");
+    pb_system("chroot $targetdir /bin/bash -c \"$pbos->{'install'} $opts{'a'} \"","Adding packages to OS by running $pbos->{'install'} $opts{'a'}");
 }
 
@@ -244 +324 @@
 #
 pb_log(1,"Cleaning up\n");
-pb_system("umount $vepath/proc","Unmounting /proc");
+pb_system("umount $targetdir/proc","Unmounting /proc");
 
 # Executes post-install step if asked for
 if ($opts{'s'}) {
-    pb_system("$opts{'s'} $vepath","Executing the post-install script: $opts{'s'} $vepath");
-}
+    pb_system("$opts{'s'} $targetdir","Executing the post-install script: $opts{'s'} $targetdir");
+}