Changeset 1408 in ProjectBuilder

Timestamp:

Feb 6, 2012, 9:37:38 AM (12 years ago)

Author:

Bruno Cornec

Message:

r4511@cabanilles: bruno | 2012-02-06 09:29:48 +0100

• New sync point which brings a start of kernel analysis for pbmkbm

Location:

devel

Files:

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

devel/pb-modules/etc/pb.conf

@@ -396 +396 @@
 mkbmbootcmds linux = perl,mt,awk,gawk,dd,grep,uname,df,loadkeys,pidof,gzip,klogd,syslogd,rsyslogd,syslog-ng,mount,mount.nfs,mount.nfs4,sshfs,mount.fuse,fusermount,ssh,ulockmgr_server,mount.cifs,mount.cifs3,mount.smb,mount.smb3,mount.smbfs,mount.smbfs3,mount.ntfs,mount.ntfs-3g,MAKEDEV,udev.static,udevsend,udevd,hwup,path_id,scsi_tur,udeadm,udevstart.static,udev_volume_id,start_udev,udevstart,create_static_dev_nodes,scsi_id,insmod,lsmod,modprobe,mdadm,mdassemble,raidstart,multipath,dmsetup,kpartx,dmraid,mpath_prio_alua,mpath_wait,mpath_ctl,mpath_prio_emc,mpath_prio_hds_modular,mpath_prio_netapp,mpath_prio_ontap,mpath_prio_rdac,mpath_prio_tpc,ping,ifconfig,ip,route,dhclient,dhcpcd,
 
+# Where is your kernel file - optional if you want to really be sure of what is used
+#mkbmkerneldir linux = /boot
+# Where is your kernel directory
+mkbmkerneldir linux = /boot
+#mkbmkerneldir linux = /boot/efi
+# What is the regular expression to find the kernel file 
+mkbmkernelnamere linux = ^linu|^vmlinu|^xen
+
 # Files to add on the boot media to support a full working system
 mkbmbasefiles linux = /etc/modules.conf,/etc/fstab,/etc/hosts,/etc/host.conf,/etc/resolv.conf,/etc/hosts.allow,/etc/hosts.deny,/etc/nsswitch.conf,/usr/share/misc/file/magic,/usr/share/file/magic,/usr/share/file/magic.mgc
@@ -405 +413 @@
 #
 # To support debug
-mkbmbbgfiles linux =
-mkbmbbgcmds linux = ldd,strace,valgrind,dmidecode,lsusb,lshw,lspci,ethtool
-mkbmbbgdirs linux = /usr/lib/valgrind,/usr/lib64/valgrind
+mkbmdbgfiles linux =
+mkbmdbgcmds linux = ldd,strace,valgrind,dmidecode,lsusb,lshw,lspci,ethtool
+mkbmdbgdirs linux = /usr/lib/valgrind,/usr/lib64/valgrind
 
 # Where are the ISO bootloader for this OS

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

@@ -12 +12 @@
 =head1 SYNOPSIS
 
-Those files have the same format, which is near from a a perl hash structure:
+Those files have the same format, which is near from a perl hash structure:
 keyword key = value1[,value2,...]
 
@@ -111 +111 @@
  Example: filteredfiles mindi = rootfs/sbin/init,mindi,install.sh,doc/mindi.8
 
+=item B<logcmd>
+
+ Nature: Mandatory
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: internal (the application then handles the logging of what it finds useful) or the name of an application to launch to log context (e.g. sos, cfg2html, ...).
+ Conffile: pb
+ Example: logcmd pbmkbm = sos
+
+=item B<logcmds>
+
+ Nature: Optional
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: In case the B<logcmd> command is internal, a coma separated list of the commands whose trace execution is to be captured in order to log context.
+ Conffile: pb
+ Example: logcmds pbmkbm = mount,lsmod,esxcfg-module -l,df -T
+
+=item B<logfiles>
+
+ Nature: Optional
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: In case the B<logcmd> command is internal, a coma separated list of the files to capture in order to log context.
+ Conffile: pb
+ Example: logfiles pbmkbm = /etc/raidtab,/proc/cmdline,/proc/swaps
+
+=item B<logopt>
+
+ Nature: Optional
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: In case the B<logcmd> command is not internal, the options of the B<logcmd> application to launch to log context
+ Conffile: pb
+ Example: logcmd pbmkbm = --all
+
+=item B<mkbmbootcmds>
+
+ 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: coma separated list of commands to be copied from the original OS to the target boot media tree (works recursively for directory creation on the target). Their actual path is deduced from the PATH variable.
+ Conffile: pb
+ Example: mkbmbootcmds linux = perl,awk,gawk,dd,grep,uname
+
+=item B<mkbmbootdirs>
+
+ 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: coma separated list of directories to be copied from the original OS to the target boot media tree (works recursively on the target).
+ Conffile: pb
+ Example: mkbmbootdirs linux = /etc/ssh,/etc/udev,/etc/mdadm
+
+=item B<mkbmbootfiles>
+
+ 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: coma separated list of files to be copied from the original OS to the target boot media tree (works recursively for directory creation on the target).
+ Conffile: pb
+ Example: mkbmbootfiles linux = /etc/mdadm.conf,/etc/raidtab,/etc/modprobe.conf
+
+=item B<mkbmkerneldir>
+
+ 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 directory containing your kernel.
+ Conffile: pb
+ Example: mkbmkerneldir linux = /boot
+
+=item B<mkbmkernelfile>
+
+ Nature: Optional
+ 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: full path of the your kernel.
+ Conffile: pb
+ Example: mkbmkernelfile linux = /boot/vmlinuz-specific
+
+=item B<mkbmkernelnamere>
+
+ 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: Perl Regular Expression allowing to find OS kernel names in the B<kerneldir> directory.
+ Conffile: pb
+ Example: mkbmkerneldir linux = ^linu|^vmlinu|^xen
+
 =item B<mkbmpath>
 
@@ -118 +198 @@
  Conffile: pb
  Example: mkbmpath default = /var/cache/pbmkbm
+
+=item B<mkbmtargetdirs>
+
+ 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: coma separated list of empty directory paths to be created on the target boot media.
+ Conffile: pb
+ Example: mkbmtargetdirs linux = /tmp,/dev
 
 =item B<namingtype>

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

@@ -393 +393 @@
 
 # On linux can also use /proc/sys/kernel/osrelease
-my $rel = `uname -m`;
+my $rel = `uname -r`;
 chomp($rel);
 return($rel);

devel/pbmkbm/bin/pbmkbm

@@ -306 +306 @@
             $lcmd = pb_check_req($lcmd,1);
             if (not defined $lcmd) {
-                pb_log(1,"INFO: command $lcmd (in $c) doesn't exist\n");
+                pb_log(1,"INFO: command $c doesn't exist\n");
                 pb_log(1,"------------------\n");
                 next;
@@ -405 +405 @@
 
 # Create the directory structure needed on the target dir
-my ($tdirs,$bdirs,$bfiles,$bcmds) = pb_distro_get_param($pbos,pb_conf_get("mkbmtargetdirs","mkbmbootdirs","mkbmbootfiles","mkbmbootcmds");
+my ($tdirs,$bdirs,$bfiles,$bcmds) = pb_distro_get_param($pbos,pb_conf_get("mkbmtargetdirs","mkbmbootdirs","mkbmbootfiles","mkbmbootcmds"));
 # Create empty dirs for these
 foreach my $d (split(/,/,$tdirs)) {
-    $targettree->{$d} = "emptydir";
+    $targettree{$d} = "emptydir";
 }
 # And copy dirs for those
 foreach my $d (split(/,/,$bdirs)) {
     if (-d $d) {
-        $targettree->{$d} = "dir";
+        $targettree{$d} = "dir";
+    } elsif (-l $d) {
+        $targettree{$d} = "link";
     } else {
-        pb_log(
+        pb_log(1,"INFO: Directory $d doesn't exist\n");
+    }
 }
 foreach my $f (split(/,/,$bfiles)) {
-    $targettree->{$d} = "dir";
-}
+    $targettree{$f} = "file";
+}
+pb_log(2,"INFO: Target Tree is now: ".Dumper(%targettree)."\n");
 # Once the environment is made, add what is needed for this boot media to it.
 # Keyboard
@@ -425 +429 @@
 # List of commands
 # List of dependencies
-# Kernel
+# Kernel - We use 2 objects, the running kernel and the target kernel which could be different
+my %rkernel;
+my %tkernel;
+pb_mkbm_find_kernel(\%rkernel);
 # Initrd
 # init 
@@ -471 +478 @@
 }
 
+sub pb_mkbm_find_kernel {
+
+my $kernel = shift;
+
+$kernel->is_xen = undef;
+# See if we're booted from a Xen kernel
+# From http://wiki.xensource.com/xenwiki/XenCommonProblems#head-26434581604cc8357d9762aaaf040e8d87b37752
+if ( -f "/proc/xen/capabilities") {
+    # It's a Xen kernel
+    pb_log(2,"INFO: We found a Xen Kernel running\n");
+}
+
+my $kfile = pb_distro_get_param($pbos,pb_conf_get_if("mkbmkernelfile"));
+if ((defined $kfile) && ($kfile ne "")) {
+    pb_log(1,"INFO: You specified your kernel as $kfile, so using it\n");
+    $kernel->file = $kfile;
+} else {
+    $kernel->dir = pb_distro_get_param($pbos,pb_conf_get("mkbmkerneldir"));
+    die "ERROR: The mkbmkerneldir content ($kernel->dir) doesn't refer to a directory\n"if (! -d $kernel->dir);
+    pb_log(1,"INFO: Analyzing directory $kernel->dir to find your kernel");
+    $kernel->namere = pb_distro_get_param($pbos,pb_conf_get("mkbmkernelnamere"));
+}
+
+# TODO: Look at a better way to find the name of the kernel we run
+# look at /proc/sys/kernel/bootloader_type /proc/sys/kernel/bootloader_version
+# to have a better guess
+my $dh;
+die "ERROR: Unable to open the mkbmkerneldir content ($kernel->dir)" if (! opendir($dh,$kernel->dir));
+while (readdir $dh) {
+    # Skip non-files
+    next if ((! -f $_) && (! -l $_));
+    # Skip files not correpsonding to the RE planned
+    next if ($_ !~ /$kernel->namere/);
+    #my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks) = stat("$f/$_");
+}
+closedir($dh);
+$kernel->release = pb_get_osrelase();
+}
+
 sub pb_mkbm_create_media {