Changeset 2659 in MondoRescue

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

Files:

• mr/Makefile.PL (modified) (7 diffs)
• mr/etc/mondorescue.conf (modified) (1 diff)
• mr/lib/MondoRescue/Base.pm (modified) (3 diffs)
• mrmini/Makefile.PL (modified) (2 diffs)
• mrmini/etc/mrmini.conf (modified) (2 diffs)
• mrmini/lib/MondoRescue/Mini (moved) (moved from devel/mrmini/lib/MondoRescue/Mindi )
• mrmini/lib/MondoRescue/Mini/Base.pm (added)
• mrmini/sbin/mrmini (modified) (5 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);
+}

devel/mrmini/Makefile.PL

@@ -9 +9 @@
     VERSION      => 'PBVER',
     INST_SCRIPT  => 'blib/sbin',
-    INSTALLDIRS  => 'perl',
+    INSTALLDIRS  => 'vendor',
     PREREQ_PM    => {
             #HTTP::Headers                    => 1.59,
@@ -21 +21 @@
             'sbin/mrprepare-lvm' => '$(INST_MAN1DIR)/mrprepare-lvm.$(MAN1EXT)', 
                     },
-    #MAN3PODS      => { 
-            #'lib/MondoRescue/Mini/LVM.pm' => '$(INST_MAN3DIR)/MondoRescue::Mini::LVM.$(MAN3EXT)',
-            #},
+    MAN3PODS      => {  
+            'lib/MondoRescue/Mini/Base.pm' => '$(INST_MAN3DIR)/MondoRescue::Mini::Base.$(MAN3EXT)',
+            },
 );
+
+
+package MY;
+
+sub postamble {
+
+    use MondoRescue::DynConf;
+
+    my ($confdir,$proj) = mr_dynconf_init();
+
+    my $text .= "install ::\n";
+    $text .= "\t".'@echo PBPKG PBVER-rPBREV will be installed under $(DESTDIR)'."\n";
+    $text .= "\tinstall -m 755 -d ".' $(DESTDIR)/$(INSTALLMAN1DIR)/../man5 $(DESTDIR)'."/$confdir/".'; cp etc/PBPKG.conf $(DESTDIR)'."/$confdir/PBPKG.conf.dist ; pod2man etc/PBPKG.conf > ".'$(DESTDIR)/$(INSTALLMAN1DIR)/../man5/PBPKG.conf.5'."\n";
+    $text .= "\t".'md5sum $(DESTDIR)'."$confdir/PBPKG.conf.dist > ".'$(DESTDIR)'."$confdir/PBPKG.conf.dist.md5\n";
+    return($text);
+}

devel/mrmini/etc/mrmini.conf

@@ -88 +88 @@
 #
 mr_force_mods mrmini = 
-mr deny_mods mrmini = 
-
-#
-# Location of the fstab file
-#
-mr_fstab default = /etc/fstab
+mr_deny_mods mrmini = 
 
 #
@@ -99 +94 @@
 #
 mr_log_file mrmini = /var/log/mrmini.log
-mr_log_file mondoarchive = /var/log/mondoarchive.log
-mr_log_file mondorestore = /var/log/mondorestore.log
 
 #

devel/mrmini/sbin/mrmini

@@ -27 +27 @@
 use MondoRescue::LVM;
 use MondoRescue::Base;
-
-# Global variables
-my %opts;                   # CLI Options
-my @date = pb_get_date();
-my $mr_date = strftime("%Y-%m-%d %H:%M:%S", @date);
+use MondoRescue::DynConf;
+use MondoRescue::Mini::Base;
 
 =pod
@@ -105 +102 @@
 
 =cut
+
+# Global variables
+my %opts;                   # CLI Options
+
 GetOptions(
         "verbose|v+" => \$opts{'v'},
@@ -154 +155 @@
 =cut
 
+
+
 # ---------------------------------------------------------------------------
 
 # Initialize the syntax string
 
-pb_syntax_init("mrmini Version PBVER-rPBREV\n");
+#
+# Global variables
+#
+my $proj;
+($mr->{'confdir'},$proj) = mr_dynconf_init();
+my @date = pb_get_date();
+$mr->{'start_date'} = strftime("%Y-%m-%d %H:%M:%S", @date);
+
+$ENV{'PBPROJ'} = $proj;
+$ENV{'PBPKG'} = "mrmini";
+
+# Adds conf files in order
+pb_conf_add("$mr->{'confdir'}/mondorescue.conf.dist","$mr->{'confdir'}/mondorescue.conf");
+($mr->{'install_dir'},$mr->{'version'}) =  mr_conf_get("mr_install_dir","mr_version");
+
+pb_syntax_init("$ENV{'PBPKG'} Version $mr->{'version'}\n");
 pb_display_init("text","");
 
@@ -190 +208 @@
     $iso = $opts{'i'};
 }
-
-#
-# Global variables
-#
-my ($MRMINI_PREFIX,$MRMINI_CONF,$MRMINI_LIB) = mr_setup_var();
-my $MRMINI_VERSION = "PBVER-rPBREV";
-my $MRMINI_SBIN = "$MRMINI_PREFIX/sbin";
-my $MRMINI_FDISK = "$MRMINI_SBIN/parted2fdik";
-my $MRMINI_DEPLIST = "$MRMINI_CONF/deplist.d";
-# Better ?
-my $ARCH = `uname -m`;
-chop($ARCH);
+my $logfile = undef;
+if (defined $opts{'l'}) {
+    $logfile = $opts{'l'};
+}
 
 # 
@@ -207 +217 @@
 #
 pb_temp_init();
-
-# Adds conf files in order
-pb_conf_add("$ENV{'HOME'}/.mondorescuerc","$MRMINI_CONF/mondorescue.conf");
-
-#
-# Configuration parameters
-#
-$ENV{'PBPROJ'} = "mrmini";
-my ($mr_boot_size,$mr_boot_cd,$mr_boot_usb,$mr_boot_tape,$mr_kernel,$mr_fstab) =  pb_conf_get("mr_boot_size","mr_boot_cd","mr_boot_usb","mr_boot_tape","mr_kernel","mr_fstab");
-my ($mr_tape_mods,$mr_scsi_mods,$mr_ide_mods,$mr_pcmcia_mods,$mr_usb_mods,$mr_net_mods,$mr_cdrom_mods,$mr_deny_mods,$mr_force_mods) =  pb_conf_get("mr_tape_mods","mr_scsi_mods","mr_ide_mods","mr_pcmcia_mods","mr_usb_mods","mr_net_mods","mr_cdrom_mods","mr_extra_mods","mr_deny_mods","mr_force_mods");
-my ($mr_logfile,$mr_cache_dir,$mr_boot_msg,$mr_burn_cmd,$mr_burn_opt) = pb_conf_get("mr_logfile","mr_cache_dir","mr_boot_msg","mr_burn_cmd","mr_burn_opt");
-
-#
-# Manage log file
-#
-my $logfile = $mr_logfile->{$ENV{'PBPROJ'}};
-
-if (defined $opts{'l'}) {
-    $logfile = $opts{'l'};
-}
-open(pbLOG,"> $logfile") || die "Unable to log to $logfile: $!";
-$pbLOG = \*pbLOG;
-$pbdebug = 0  if ($pbdebug == -1);
-pb_log_init($pbdebug, $pbLOG);
-
-pb_log(0,"mrmini start date: $mr_date");
-pb_log(0,"-------------------------------------");
-pb_log(0,"mrmini v$MRMINI_VERSION");
-pb_log(0,"$ARCH architecture detected");
-pb_log(0,"mrmini called with the following arguments: ".join(" ",@ARGV));
-pb_log(0,"-------------------------------------");
-pb_log(0,"MONDO_CACHE: $ENV{'MONDO_CACHE'}") if (defined $ENV{'MONDO_CACHE'});
-pb_log(0,"MRMINI_LIB: $MRMINI_LIB");
-pb_log(0,"MRMINI_CONF: $MRMINI_CONF");
-pb_log(0,"MRMINI_SBIN: $MRMINI_SBIN");
-if (-r "$ENV{'HOME'}/.mondorescuerc") {
-    pb_log(0,"-------------------------------------");
-    pb_log(0,"Conf file $ENV{'HOME'}/.mondorescuerc");
-    pb_display_file("$ENV{'HOME'}/.mondorescuerc");
-}
-if (-r "$MRMINI_CONF/mondorescue.conf") {
-    pb_log(0,"-------------------------------------");
-    pb_log(0,"Conf file $MRMINI_CONF/mondorescue.conf");
-    pb_display_file("$MRMINI_CONF/mondorescue.conf");
-}
-pb_log(0,"-------------------------------------");
-
-#
-# Prepare cache dir
-#
-pb_rm_rf("$mr_cache_dir/*");
-pb_mkdir_p($mr_cache_dir);
-
-# 
-# LVM setup
-#
-my ($lvmver,$lvmcmd) = mr_lvm_check();
-
-pb_log(0,"LVM $lvmver command set to $lvmcmd");
-pb_log(0,"-------------------------------------");
+mr_mini_main($logfile);
 mr_exit(0);