Changeset 1671 in ProjectBuilder

Timestamp:

Nov 10, 2012, 6:06:55 AM (12 years ago)

Author:

Bruno Cornec

Message:

r4928@localhost: bruno | 2012-06-07 19:07:57 +0200

• pbmkbm now support terminfo and stop on error (off by default)

Location:

devel

Files:

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

devel/pb-modules/etc/pb.conf

@@ -630 +630 @@
 ospathcmd-keymapre slack = s/\w\s([[:alpha:]]+.map)/$1/
 
+ospathcmd-termdir default = /usr/share/terminfo
+
 # Some path for commands may defer from one system to another
 ospathcmd-halt solaris = /usr/sbin/halt

devel/pbmkbm/bin/pbmkbm

@@ -12 +12 @@
 use strict 'vars';
 use Getopt::Long qw(:config auto_abbrev no_ignore_case);
+use Carp qw/confess cluck/;
 use Data::Dumper;
 use English;
@@ -200 +201 @@
 my $appname = "pbmkbm";
 $ENV{'PBPROJ'} = $appname;
+
+$Global::pb_stop_on_error = 0;  # False by default
 
 # Initialize the syntax string
@@ -218 +221 @@
     "boot|b=s" => \$opts{'b'},
     "version|V=s" => \$opts{'V'},
+    "stop-on-error!" => \$Global::pb_stop_on_error,
 ) || pb_syntax(-1,0);
 
@@ -267 +271 @@
 # Check for command requirements
 #
-my ($req,$opt) = pb_conf_get_if("oscmd","oscmdopt");
-pb_check_requirements($req,$opt,$appname);
+my ($req,$opt,$pbstoponerr) = pb_conf_get_if("oscmd","oscmdopt","pbstoponerr");
+$Global::pb_stop_on_error = 1 if ((defined $pbstoponerr) && (defined $pbstoponerr->{$ENV{'PBPROJ'}}) && ($pbstoponerr->{$ENV{'PBPROJ'}} =~ /true/oi));
+#pb_check_requirements($req,$opt,$appname);
 
 # After that we will need root access
@@ -419 +424 @@
 foreach my $d (split(/,/,$bdirs)) {
     if (-d $d) {
-        $targettree{$d} = "dir";
+        $targettree{$d} = "recurdir";
     } elsif (-l $d) {
-        $targettree{$d} = "link";
+        $targettree{$d} = "link:$d";
     } else {
         pb_log(1,"INFO: Directory $d doesn't exist\n");
@@ -429 +434 @@
     $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
 pb_mkbm_find_keyboard(\%targettree);
 # Terminfo
+pb_mkbm_find_terminfo(\%targettree);
 # List of commands
 # List of dependencies
@@ -444 +449 @@
 # BootLoader and its configuration
 # Additional data files coming from a potential caller (MondoRescue/Mindi e.g. with fstab, LVM, mountlist, ...)
+pb_log(1,"INFO: Target Tree is now: ".Dumper(%targettree)."\n");
 pb_log(1,"End of boot media creation\n");
 }
@@ -500 +506 @@
 die "Unable to read the keymapre $keymapre" if (not defined $keymapre);
 
-# if a direct keymap file is given as keyfile, use only the first existing one it and return
+# if a direct keymap file is given as keyfile, use only the first existing one and return
 my $foundkmap = 0;
 foreach my $f (split(/,/,$keyfile)) {
@@ -530 +536 @@
 
 pb_log(1,"End of keyboard analysis\n");
+}
+
+sub pb_mkbm_find_terminfo {
+
+my $tgtree = shift;
+
+pb_log(1,"Analyzing your terminfo's configuration\n");
+my $termdir = pb_distro_get_param($pbos,pb_conf_get("ospathcmd-termdir"));
+die "Unable to read the keymapdir $termdir" if ((not defined $termdir) || (! -d $termdir));
+$tgtree->{$termdir} = "recurdir";
+
+pb_log(1,"End of terminfo analysis\n");
 }