Changeset 2659 in MondoRescue for devel/mr

Timestamp:

Jun 23, 2010, 4:26:59 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3911@wsip-70-165-196-181: bruno | 2010-06-22 03:34:20 +0200

• First packaged version of a mrmin version begining to work (but doing nothing interesting yet ;-)

Location:

devel/mr

Files:

• Makefile.PL (modified) (7 diffs)
• etc/mondorescue.conf (modified) (1 diff)
• lib/MondoRescue/Base.pm (modified) (3 diffs)

devel/mr/Makefile.PL

@@ -9 +9 @@
     VERSION   => 'PBVER',
     INST_SCRIPT  => 'blib/bin',
-    INSTALLDIRS  => 'perl',
+    INSTALLDIRS  => 'vendor',
     PREREQ_PM   => {
             #HTTP::Headers                  => 1.59,
@@ -61 +61 @@
             $target = "/usr/local";
             if (not defined $confdir) {
-                $confdir = "/usr/local/etc";
+                $confdir = "$target/etc";
+            }
+            if (not defined $cachedir) {
+                $cachedir = "$target/var/cache";
             }
         } else {
-            $sharedir = $sharedir || "$target/share";
-            $mandir = $mandir || "$sharedir/man";
             $cachedir = $cachedir || "$target/var/cache";
             if (not defined $confdir) {
                 die "CONFDIR should be defined if PREFIX is defined";
             }
+            if (not defined $cachedir) {
+                die "CACHEDIR should be defined if PREFIX is defined";
+            }
         }
+        $sharedir = $sharedir || "$target/share";
+        $mandir = $mandir || "$sharedir/man";
 
         my $conff = "etc/PBPROJ.conf";
@@ -83 +89 @@
 mr_install_dir default = $target
 #
-#
 # conf dir
 #
@@ -95 +100 @@
 #
 mr_share_dir default = $sharedir/PBPROJ
+#
+# version
+#
+mr_version default = PBVER-rPBREV
 EOF
         close(CONF);
@@ -102 +111 @@
 
         $text .= "install ::\n";
-        $text .= "\t".'@echo PBPKG PBVER-PBREV will be installed under $(DESTDIR)'."\n";
+        $text .= "\t".'@echo PBPKG PBVER-rPBREV will be installed under $(DESTDIR)'."\n";
         $text .= "\t".'install -m 755 -d $(DESTDIR)'."$confdir/PBPROJ".' $(DESTDIR)'."$cachedir/PBPROJ".' $(DESTDIR)'."$sharedir/PBPROJ\n";
         $text .= "\t".'cp etc/PBPROJ.conf $(DESTDIR)'."$confdir/PBPROJ/PBPROJ.conf.dist ; install -m 755 -d ".' $(DESTDIR)'."$mandir/man5 ; pod2man etc/PBPROJ.conf > ".'$(DESTDIR)'."$mandir/man5/PBPROJ.conf.5\n";
         $text .= "\t".'md5sum $(DESTDIR)'."$confdir/PBPROJ/PBPROJ.conf.dist > ".'$(DESTDIR)'."$confdir/PBPROJ/PBPROJ.conf.dist.md5\n";
-        $text .= "\t".'cp lib/MondoRescue/DynConf.pm $(DESTDIR)/$(INST_LIBDIR)/'."\n";
-        $text .= "\t".'md5sum $(DESTDIR)'."$confdir/PBPROJ/PBPROJ.conf.dist > ".'$(DESTDIR)'."$confdir/PBPROJ/PBPROJ.conf.dist.md5\n";
-        #$text .= "\t".'if [ -f etc/PBKG.conf ]; then cp etc/PBPKG.conf $(DESTDIR)'."$confdir/PBPROJ/PBKG.conf.dist ; install -m 755 -d ".' $(DESTDIR)'."$mandir/man5 ; pod2man etc/PBPKG.conf > ".'$(DESTDIR)'."$mandir/man5/PBPKG.conf.5 ; fi\n";
-        #$text .= "\t".'md5sum $(DESTDIR)'."$confdir/PBPROJ/PBPKG.conf.dist > ".'$(DESTDIR)'."$confdir/PBPROJ/PBPKG.conf.dist.md5\n";
+        $text .= "\t".'cp lib/MondoRescue/DynConf.pm $(DESTDIR)/$(VENDORLIBEXP)/MondoRescue/'."\n";
 
         # Now generate a perl module used by every other one in the project
@@ -152 +158 @@
 
 This function returns all the installation PATH info needed by the project
-It takes no parameter and returns 3 values
+It takes no parameter and returns 2 values
 First value is the conf dir
 Second value is the project name
@@ -159 +165 @@
 
 sub mr_dynconf_init {
-    return($confdir,PBPROJ);
+    return("$confdir/PBPROJ","PBPROJ");
 }
 1;

devel/mr/etc/mondorescue.conf

@@ -20 +20 @@
 mr_fstab default = /etc/fstab
 
+#
+# Interface to burner
+#
+mr_burn_cmd default = /usr/bin/wodim
+#mr_burn_cmd default = /usr/bin/cdrecord
+
+mr_burn_opt default = -v
 # 
 # LVM commands and conf files

devel/mr/lib/MondoRescue/Base.pm

@@ -25 +25 @@
 use Exporter;
 
+# Global hash for configuration params of mr
+my %mr;
+our $mr = \%mr;
+
 # Export, by default, all the functions into the namespace of
 # any code which uses this module.
 
 our @ISA = qw(Exporter);
-our @EXPORT = qw(mr_init mr_exit);
+our @EXPORT = qw(mr_init mr_exit mr_conf_get $mr);
 
 =pod
@@ -71 +75 @@
 #
 # Conf files Management
-# the $MRMINI_CONF/mondorescue.conf.dist is delivered as part of the project and
+# the $etcdir/mondorescue.conf.dist is delivered as part of the project and
 # its checksum is verified as we need good default values that we can trust
 #
@@ -106 +110 @@
 exit($code);
 }
+
+=item B<mr_conf_get>
+
+This function get parameters in configuration files and returns from the least significant level (default) to the emost significant level (application name), passing by the project name.
+It takes a list of parameters to find and returns the values corresponding
+
+=cut
+
+
+sub mr_conf_get {
+    my @params = @_;
+    my @ptr = ();
+    my $ptr;
+    
+    pb_log(2,"Entering mr_conf_get\n");
+    my @args1 = pb_conf_get_if(@params);
+    my $proj = $ENV{'PBPROJ'};
+    $ENV{'PBPROJ'} = $ENV{'PBPKG'};
+    my @args2 = pb_conf_get_if(@params);
+    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);
+        $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);
+}