Changeset 3644 in MondoRescue

Timestamp:

Jan 3, 2017, 2:04:51 AM (7 years ago)

Author:

Bruno Cornec

Message:

• Adds a new perl script (mr-getparam) to get parameters from mondorescue conf file (WIP)
• Adds a new perl script (mr-distro-getparam) to get parameters from mondorescue conf file based on the current distribution

Location:

branches/3.3/MondoRescue

Files:

• Makefile.PL (modified) (1 diff)
• bin/mr-distro-getparam (added)
• bin/mr-getparam (added)
• etc/mondorescue.conf (modified) (2 diffs)
• lib/MondoRescue/Base.pm (modified) (4 diffs)

branches/3.3/MondoRescue/Makefile.PL

@@ -26 +26 @@
                 bin/mr-net-get-config
                 bin/mr-label
+                bin/mr-getparam
+                bin/mr-distro-getparam
                 ) ],
 );

branches/3.3/MondoRescue/etc/mondorescue.conf

@@ -74 +74 @@
 mr_cmd_lshw linux = /usr/sbin/lshw
 # Pb of key here want both linux and mrmini or mondoarchive or ...
-mr_cmd_mkisofs linux = /usr/bin/mkisofs
-mr_opt_mkisofs linux = -J -r -v -p MondoRescue -publisher http://www.mondorescue.org -A MondoRescue
+mr_cmd_mkiso linux = /usr/bin/mkisofs
+mr_opt_mkiso linux = -J -r -v -p MondoRescue -publisher http://www.mondorescue.org -A MondoRescue
+mr_cmd_mkiso mageia = /usr/bin/xorriso
 
 #
@@ -97 +98 @@
 # =head1 COPYRIGHT
 
-# (c) B. Cornec 2007-2014
+# (c) B. Cornec 2007-today
 #
 # Provided under the Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) Creative Common License

branches/3.3/MondoRescue/lib/MondoRescue/Base.pm

@@ -61 +61 @@
 my $msg = shift || "";
 
-pb_log_init($pbdebug);
+pb_log_init($pbdebug, $pbLOG);
 
 if (defined $msg) {
@@ -67 +67 @@
 }
 
+# Temp dir
+pb_temp_init($pbdebug);
 
 my $pbproj;
@@ -72 +74 @@
 ($mr->{'confdir'},$pbproj) = mr_dynconf_init();
 
-# Temp dir
-pb_temp_init();
+# First setup the PBPRJ env var
+pb_conf_init($pbproj);
 
-# First use the main configuration file
-pb_conf_init($pbproj);
-$ENV{'PBPROJ'} = $pbproj;
 #
 # Conf files Management
@@ -141 +140 @@
     pb_log(2,"Entering mr_conf_get\n");
     my @args1 = pb_conf_get_if(@params);
+    my @args2 = ();
     my $proj = $ENV{'PBPROJ'};
-    $ENV{'PBPROJ'} = $ENV{'PBPKG'};
-    my @args2 = pb_conf_get_if(@params);
+    if (defined $ENV{'PBPKG'}) {
+        $ENV{'PBPROJ'} = $ENV{'PBPKG'};
+        @args2 = pb_conf_get_if(@params);
+        $ENV{'PBPROJ'} = $proj;
+    }
     foreach my $i (0..$#args1) {
         $ptr = undef;
         # Process from least important to more important
-        $ptr = $args1[$i]->{'default'};
-        $ptr[$i] = $ptr if (defined $ptr);
-        $ptr = $args1[$i]->{$ENV{'PBPROJ'}};
-        $ptr[$i] = $ptr if (defined $ptr);
-        $ptr = $args2[$i]->{$ENV{'PBPKG'}};
-        $ptr[$i] = $ptr if (defined $ptr);
+        if (defined $args1[$i]->{'default'}) {
+            $ptr[$i] = $args1[$i]->{'default'};
+        }
+        if (defined $args1[$i]->{$ENV{'PBPROJ'}}) {
+            $ptr[$i] = $args1[$i]->{$ENV{'PBPROJ'}};
+        }
+        if ((defined $ENV{'PBPKG'}) and (defined $args2[$i]) and (defined $args2[$i]->{$ENV{'PBPKG'}})) {
+            $ptr[$i] = $args2[$i]->{$ENV{'PBPKG'}};
+        }
         $ptr[$i] = "Undefined" if (not defined $ptr[$i]);
         pb_log(2,"Found parameter $params[$i] with value $ptr[$i]\n");
     }
-    $ENV{'PBPROJ'} = $proj;
     return(@ptr);
 }