Changeset 2650 in MondoRescue for devel

Timestamp:

Jun 13, 2010, 12:36:38 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3875@localhost: bruno | 2010-06-12 12:31:38 +0200

• Review completely the installation process for mrmini, and first packages buildable

Location:

devel

Files:

• mr/Makefile.PL (modified) (1 diff)
• mr/etc/mondorescue.conf (modified) (1 diff)
• mr/lib/MondoRescue/Base.pm (modified) (2 diffs)
• mr/lib/MondoRescue/LVM.pm (modified) (1 diff)
• mr/post-install.sh (deleted)
• mrmini/etc/mrmini.conf (moved) (moved from devel/mrmini/etc/mindi.conf )
• mrmini/post-install.sh (deleted)
• mrmini/sbin/mrmini (moved) (moved from devel/mrmini/sbin/mrmindi ) (3 diffs)
• mrmini/sbin/mrmini-bkphw (moved) (moved from devel/mrmini/sbin/mindi-bkphw )

devel/mr/Makefile.PL

@@ -5 +5 @@
 # the contents of the Makefile that is written.
 WriteMakefile(
-    NAME         => 'PBPKG',
-    DISTNAME     => 'PBPKG',
-    VERSION      => 'PBVER',
-    INST_SCRIPT  => 'blib/bin',
+    NAME         => 'PBPKG',
+    DISTNAME     => 'PBPKG',
+    VERSION   => 'PBVER',
+    INST_SCRIPT  => 'blib/bin',
     INSTALLDIRS  => 'perl',
-    PREREQ_PM    => {
-            #HTTP::Headers                    => 1.59,
-            #Template                         => 0,
-    },    # e.g., Module::Name => 1.1
+    PREREQ_PM   => {
+            #HTTP::Headers                  => 1.59,
+            #Template                        => 0,
+    },  # e.g., Module::Name => 1.1
     #ABSTRACT_FROM => 'bin/',   # retrieve abstract from module
-    AUTHOR        => 'Bruno Cornec <bruno#mondorescue.org>',
-    EXE_FILES     => [ qw( sbin/mranalyze-lvm sbin/mrcheck-lvm ) ],
-    MAN1PODS      => { 
-            'sbin/mranalyze-lvm' => '$(INST_MAN1DIR)/mranalyze-lvm.$(MAN1EXT)', 
-            'sbin/mrcheck-lvm' => '$(INST_MAN1DIR)/mranalyze-lvm.$(MAN1EXT)', 
+    AUTHOR      => 'Bruno Cornec <bruno#mondorescue.org>',
+    EXE_FILES    => [ qw( sbin/mranalyze-lvm sbin/mrcheck-lvm ) ],
+    MAN1PODS      => {
+            'sbin/mranalyze-lvm' => '$(INST_MAN1DIR)/mranalyze-lvm.$(MAN1EXT)',
+            'sbin/mrcheck-lvm' => '$(INST_MAN1DIR)/mranalyze-lvm.$(MAN1EXT)',
                     },
-    MAN3PODS      => {  
-                        'lib/MondoRescue/Base.pm' => '$(INST_MAN3DIR)/MondoRescue::Base.$(MAN3EXT)', 
-                        'lib/MondoRescue/LVM.pm' => '$(INST_MAN3DIR)/MondoRescue::LVM.$(MAN3EXT)', 
-                        'lib/MondoRescue/Inventory.pm' => '$(INST_MAN3DIR)/MondoRescue::Inventory.$(MAN3EXT)', 
+    MAN3PODS      => {  
+            'lib/MondoRescue/Base.pm' => '$(INST_MAN3DIR)/MondoRescue::Base.$(MAN3EXT)',
+            'lib/MondoRescue/LVM.pm' => '$(INST_MAN3DIR)/MondoRescue::LVM.$(MAN3EXT)',
+            'lib/MondoRescue/Inventory.pm' => '$(INST_MAN3DIR)/MondoRescue::Inventory.$(MAN3EXT)',
+            'lib/MondoRescue/DynConf.pm' => '$(INST_MAN3DIR)/MondoRescue::DynConf.$(MAN3EXT)',
                 },
 );
+
+package MY;
+
+sub postamble {
+
+        # Determine location of etc conf files
+        my $text ="";
+
+        # Grab out any CONFDIR or other build param
+        my $confdir = undef;
+        my $target = undef;
+        my $mandir = undef;
+        my $cachedir = undef;
+        my $sharedir = undef;
+
+        while (my $arg = shift @ARGV) {
+                my ($key, $value) = split /=/, $arg;
+                if ($key =~ /^CONFDIR$/) {
+                        $confdir = $value;
+                } elsif ($key =~ /^MANDIR$/) {
+                        $mandir = $value;
+                } elsif ($key =~ /^CACHEDIR$/) {
+                        $cachedir = $value;
+                } elsif ($key =~ /^SHAREDIR$/) {
+                        $sharedir = $value;
+                } elsif ($key =~ /^TARGET$/) {
+                        $target = $value;
+                }
+        }
+
+        if (not defined $target) {
+            $target = "/usr/local";
+            if (not defined $confdir) {
+                $confdir = "/usr/local/etc";
+            }
+        } 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";
+            }
+        }
+
+        my $conff = "etc/PBPROJ.conf";
+        open(CONF, ">> $conff") || die "Unable to append to $conff";
+        print CONF << "EOF";
+#
+# Configuration information added at install time
+#
+#
+# installation target
+#
+mr_install_dir default = $target
+#
+#
+# conf dir
+#
+mr_conf_dir default = $confdir/PBPROJ
+#
+# cache directory
+#
+mr_cache_dir default = $cachedir/PBPROJ
+#
+# share directory
+#
+mr_share_dir default = $sharedir/PBPROJ
+EOF
+        close(CONF);
+        # Create the dynamic content for MondoRescue
+        my $dynf = "lib/MondoRescue/DynConf.pm";
+        open(DYN, "> $dynf") || die "Unable to create $dynf";
+
+        $text .= "install ::\n";
+        $text .= "\t".'@echo PBPKG PBVER-PBREV 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";
+
+        # Now generate a perl module used by every other one in the project
+        print DYN << "EOF";
+#!/usr/bin/perl -w
+#
+# Declare variables for the MondoRescue project
+# This module has been GENERATED at installation time
+# DO NOT MODIFY WITHOUT GOOD REASONS.
+#
+# Copyright B. Cornec 2008
+# Provided under the GPL v2
+#
+package MondoRescue::DynConf;
+
+use strict 'vars';
+
+# Inherit from the "Exporter" module which handles exporting functions.
+ 
+use Exporter;
+ 
+# Export, by default, all the functions into the namespace of
+# any code which uses this module.
+our \@ISA = qw(Exporter);
+our \@EXPORT = qw(mr_dynconf_init);
+
+=pod
+
+=head1 NAME
+
+MondoRescue::DynConf, part of the mondorescue.org project
+
+=head1 DESCRIPTION
+
+This modules provides environment variables setup for the Mondorescue project
+
+=head1 USAGE
+
+=over 4
+
+=item B<mr_dynconf_init>
+
+This function returns all the installation PATH info needed by the project
+It takes no parameter and returns 3 values
+First value is the conf dir
+Second value is the project name
+
+=cut
+
+sub mr_dynconf_init {
+    return($confdir,PBPROJ);
+}
+1;
+=pod
+=back 
+
+=head1 WEB SITES
+
+The main Web site of the project is available at L<http://www.mondorescue.org/>. Bug reports should be filled using the trac instance of the project at L<http://trac.mondorescue.org/>.
+
+=head1 USER MAILING LIST
+
+The mailing list of the project is available at L<mailto:mondo\@lists.sf.net>
+
+=head1 AUTHORS
+
+The Mondorescue.org team L<http://www.mondorescue.org/> lead by Bruno Cornec L<mailto:bruno\@mondorescue.org>.
+
+=head1 COPYRIGHT
+
+mrmini is distributed under the GPL v2.0 license
+described in the file C<COPYING> included with the distribution.
+
+=cut
+
+
+EOF
+    close(DYN);
+    return($text);
+}

devel/mr/etc/mondorescue.conf

@@ -7 +7 @@
 # DO NOT CHANGE THAT FILE IN ANYWAY AS ITS MD5 SUM IS USED AS A CHECK !!
 # Anyway changing some values in your own configuration file may render 
-# mrmini instable or cause failures. Use with care.
+# MondoRescue tools instable or cause failures. Use with care.
 
 # Temporary directory

devel/mr/lib/MondoRescue/Base.pm

@@ -60 +60 @@
 }
 
+
 # Get the various location determined at installation time
-my ($confdir,$localdir,$pbproj) = mr_dynconf_init();
+my ($etcdir,$pbproj) = mr_dynconf_init();
 
 # Temp dir
@@ -68 +69 @@
 # First use the main configuration file
 pb_conf_init($pbproj);
-pb_conf_add("$confdir/$pbproj.conf");
+#
+# Conf files Management
+# the $MRMINI_CONF/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
+#
+open(MD5,"$etcdir/$pbproj.conf.dist.md5") || die "Unable to read mandatory $etcdir/$pbproj.conf.dist.md5: $!";
+my $omd5 = <MD5>;
+chop($omd5);
+close(MD5);
+open(CONF,"$etcdir/$pbproj.conf.dist") || die "Unable to read mandatory $etcdir/$pbproj.conf.dist: $!";
+my $md5 = Digest::MD5->new;
+binmode(CONF);
+$md5->addfile(CONF);
+die "Invalid MD5 found sum for $etcdir/$pbproj.conf.dist: $md5->hexdigest" if ($omd5 ne $md5->hexdigest);
+close(CONF);
+
+pb_conf_add("$etcdir/$pbproj.conf.dist");
 }
 

devel/mr/lib/MondoRescue/LVM.pm

@@ -277 +277 @@
     s/^[\s]*//;
 
+=pod
+
+The structure contains an array of LVs called lvs and starting at 1, containing the name of the PV as provided by the pv_name attribute of the pvs command
+
+=cut
+
     my ($vg_name,$lv_uuid,$lv_name,$lv_attr,$lv_major,$lv_minor,$lv_read_ahead,$lv_kernel_major,$lv_kernel_minor,$lv_kernel_read_ahead,$lv_size,$seg_count,$origin,$origin_size,$snap_percent,$copy_percent,$move_pv,$convert_lv,$lv_tags,$mirror_log,$modules) = split(/:/);
-=pod
-
-The structure contains an array of LVs called lvs and starting at 1, containing the name of the PV as provided by the pv_name attribute of the pvs command
-pv_name              - Name of the physical volume PV
-
-=cut
-
-    # Array of PVs for that VG
-    $lvm->{$vg_name}->{'pvs'}->[$lvm->{$vg_name}->{'pvnum'}] = $pv_name;
 
 =pod

devel/mrmini/sbin/mrmini

@@ -57 +57 @@
 # Handle options
 #
+
+=pod
+=over 4
+=item B<-v|--verbose>
+
+Print a brief help message and exits.
+
+=item B<-q|--quiet>
+
+Do not print any output.
+
+=item B<-h|--help>
+
+Print a brief help message and exits.
+
+=item B<--man>
+
+Prints the manual page and exits.
+
+=item B<-i|--iso iso_image>
+
+Name of the ISO image you want to created.
+
+=item B<-u|--usb usb_device>
+
+Name of the USB device on which you want to created your image.
+
+=item B<-t|--tape tape_device>
+
+Name of the Tape device on which you want to created your image.
+
+=item B<-o|--obdr>
+
+Activate OBDR mode for tape (Bootable tape devices)
+
+=item B<-V|--version>
+
+Display mrmini version and exit
+
+=item B<-f|--force>
+
+Force usage of defaults parameters or values without asking questions
+
+=item B<-p|--printvars variable>
+
+Prints the value of the variable passed as parameter
+
+=cut
 GetOptions(
-
-=over 4
-
-=cut
         "verbose|v+" => \$opts{'v'},
-
-=item B<-v|--verbose>
-
-Print a brief help message and exits.
-
-=cut
         "quiet|q" => \$opts{'q'},
-
-=item B<-q|--quiet>
-
-Do not print any output.
-
-=cut
         "help|?|h" => \$opts{'h'}, 
-
-=item B<-h|--help>
-
-Print a brief help message and exits.
-
-=cut
         "man" => \$opts{'man'},
-
-=item B<--man>
-
-Prints the manual page and exits.
-
-=cut
         "iso|i=s" => \$opts{'i'},
-
-=item B<-i|--iso iso_image>
-
-Name of the ISO image you want to created.
-
-=cut
         "usb|u=s" => \$opts{'u'},
-
-=item B<-u|--usb usb_device>
-
-Name of the USB device on which you want to created your image.
-
-=cut
         "tape|t=s" => \$opts{'t'},
-
-=item B<-t|--tape tape_device>
-
-Name of the Tape device on which you want to created your image.
-
-=cut
         "obdr|o" => \$opts{'o'},
-
-=item B<-o|--obdr>
-
-Activate OBDR mode for tape (Bootable tape devices)
-
-=cut
         "version|V" => \$opts{'V'},
-
-=item B<-V|--version>
-
-Display mrmini version and exit
-
-=cut
         "force|f" => \$opts{'f'},
-
-=item B<-f|--force>
-
-Force usage of defaults parameters or values without asking questions
-
-=cut
         "printvar|p=s" => \$opts{'p'},
-
-=item B<-p|--printvars variable>
-
-Prints the value of the variable passed as parameter
-
-=cut
         "log-files|l=s" => \$opts{'l'},
 ) || pb_syntax(-1,0);
 
+=pod
 =back 
 
@@ -215 +194 @@
 # Global variables
 #
+my ($MRMINI_PREFIX,$MRMINI_CONF,$MRMINI_LIB) = mr_setup_var();
 my $MRMINI_VERSION = "PBVER-rPBREV";
-my $MRMINI_PREFIX = "XXX";
-my $MRMINI_CONF = "YYY";
-my $MRMINI_LIB = "LLL";
 my $MRMINI_SBIN = "$MRMINI_PREFIX/sbin";
 my $MRMINI_FDISK = "$MRMINI_SBIN/parted2fdik";
@@ -231 +208 @@
 pb_temp_init();
 
-#
-# Conf files Management
-# the $MRMINI_CONF/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
-#
-open(MD5,"$MRMINI_CONF/mondorescue.conf.dist.md5") || die "Unable to read mandatory $MRMINI_CONF/mondorescue.conf.dist.md5: $!";
-my $omd5 = <MD5>;
-chop($omd5);
-close(MD5);
-open(CONF,"$MRMINI_CONF/mondorescue.conf.dist") || die "Unable to read mandatory $MRMINI_CONF/mondorescue.conf.dist: $!";
-my $md5 = Digest::MD5->new;
-binmode(CONF);
-$md5->addfile(CONF);
-die "Invalid MD5 found sum for $MRMINI_CONF/mondorescue.conf.dist: $md5->hexdigest" if ($omd5 ne $md5->hexdigest);
-close(CONF);
-
 # Adds conf files in order
-pb_conf_add("$ENV{'HOME'}/.mondorescuerc","$MRMINI_CONF/mondorescue.conf","$MRMINI_CONF/mondorescue.conf.dist");
+pb_conf_add("$ENV{'HOME'}/.mondorescuerc","$MRMINI_CONF/mondorescue.conf");
 
 #