Changeset 1403 in ProjectBuilder

Timestamp:

Feb 3, 2012, 12:17:07 AM (12 years ago)

Author:

Bruno Cornec

Message:

r4490@cabanilles: bruno | 2012-02-03 00:10:53 +0100

• Still further on pbmkbm (sync point)

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (1 diff)
• pbmkbm/bin/pbmkbm (modified) (2 diffs)

devel/pb-modules/etc/pb.conf

@@ -386 +386 @@
 logcommands pbmkbm = mount,lsmod,esxcfg-module -l,df -T
 
-# Directories to create on the target media
-targetdir pbmkbm = /bin,/usr/bin,/tmp
-# Files to embed on the target media
-mandatoryfiles pbmkbm = 
-optionalfiles pbmkbm = 
+# What is needed at boot time to have a minimal working environment
+# Directories to create on the target media, even if no file is in it (else it will be created automatically)
+mkbmtargetdirs linux =  /tmp,/dev
+# In term of dirs from the original to copy to the target
+mkbmbootdirs linux =  /etc/modprobe.d/,/etc/ssh,/etc/udev,/etc/hotplug.d,/etc/mdadm,/var/lib/dhcp
+# In term of files from the original to copy to the target
+mkbmbootfiles linux = /etc/init.d/functions,/etc/rc.d/functions,/etc/rpc,/etc/netconf,/usr/lib/libnss_compat.so,/usr/lib64/libnss_compat.so,/usr/lib/libnss_files.so,/usr/lib64/libnss_files.so,/etc/modprobe.conf,/etc/conf.modules,/etc/modules.conf.local,/etc/mdadm.conf,/etc/raidtab
+# In term of commands from the original to copy to the target
+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,
+
+# 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
+#mkbmbasefiles lsb-3.2 = /usr/share/misc/file/magic,/usr/share/misc/magic.mgc
+## Dirs to add
+mkbmbasedirs linux =
+# Commands to add
+mkbmbasecmds linux = file,bzip2,bunzip2,bash,date,ctrlaltdel,wc,xargs,less,ldconfig,tee,efibootmgr,lilo,grub,elilo,fdisk,parted
+#
+# To support debug
+mkbmbbgfiles linux =
+mkbmbbgcmds linux = ldd,strace,valgrind,dmidecode,lsusb,lshw,lspci,ethtool
+mkbmbbgdirs linux = /usr/lib/valgrind,/usr/lib64/valgrind
 
 # Where are the ISO bootloader for this OS

devel/pbmkbm/bin/pbmkbm

@@ -405 +405 @@
 
 # Create the directory structure needed on the target dir
-$targettree->{"/bin"} = "dir";
-
+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";
+}
+# And copy dirs for those
+foreach my $d (split(/,/,$bdirs)) {
+    if (-d $d) {
+        $targettree->{$d} = "dir";
+    } else {
+        pb_log(
+}
+foreach my $f (split(/,/,$bfiles)) {
+    $targettree->{$d} = "dir";
+}
 # Once the environment is made, add what is needed for this boot media to it.
 # Keyboard
@@ -416 +429 @@
 # init 
 # BootLoader and its configuration
-# Additional data files coming from a potential caller (MondoRescue e.g. with fstab, LVM, mountlist, ...)
+# Additional data files coming from a potential caller (MondoRescue/Mindi e.g. with fstab, LVM, mountlist, ...)
 }