Changeset 3239 in MondoRescue for branches

Timestamp:

Jan 5, 2014, 1:35:28 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Fix build process for perl modules deps (creation of the perl-scripts file was incorrect with build dir in it, and overwritten)
• Fix pod2man issue on mondorescue.conf by adding pod content in it which is then processed in the Makefile.PL

Location:

branches/3.2

Files:

• MondoRescue/Makefile.PL (modified) (1 diff)
• MondoRescue/etc/mondorescue.conf (modified) (2 diffs)
• mindi/install.sh (modified) (2 diffs)
• mindi/mindi (modified) (1 diff)

branches/3.2/MondoRescue/Makefile.PL

@@ -107 +107 @@
         $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".'cp etc/PBPROJ.conf $(DESTDIR)'."$confdir/PBPROJ/PBPROJ.conf.dist ; install -m 755 -d ".' $(DESTDIR)'."$mandir/man5 ; perl -p -e 's/^# //; s/^#//' etc/PBPROJ.conf | pod2man --name=PBPROJ.conf --release=PBVER-rPBREV --section=5 > ".'$(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".'if [ ! -f "'.'$(DESTDIR)'."$confdir/PBPROJ/PBPROJ.conf".'" ]; then echo "# Local configuration file for Mondorescue" > $(DESTDIR)'."$confdir/PBPROJ/PBPROJ.conf".'; echo "# Adapt content taken from the distribution conf file PBPROJ.conf.dist which should remain untouched" >> $(DESTDIR)'."$confdir/PBPROJ/PBPROJ.conf ; fi\n";

branches/3.2/MondoRescue/etc/mondorescue.conf

@@ +1 @@
+# $Id$
+# 
+# =pod
+#
+# =head1 NAME
+# 
 # MondoRescue configuration file
 #
-# $Id$
+# =head1 DESCRIPTION
 #
-# We tried to give sensible defaults in this file.
-# It will always be loaded by the tools before your other configuration files. 
+# The mondorescue.conf contains the various parameters that can be adapted for MondoRescue usage
+#
+# =head1 SYNOPSIS
+#
+# We tried to give sensible defaults in this file (mondorescue.conf.dist).
+# It will always be loaded by the tools before your own configuration files (mondorescue.conf). 
+#
 # 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 
 # MondoRescue tools instable or cause failures. Use with care.
+#
+# =head1 CONFIGURATION PARAMETERS
+# 
 
+# =over 4
+
+# =item B<mr_tmp_dir default>
+#
 # Temporary directory
+#
 # Under it a temporary directory will be created to host all
-# temporary files for mrmini. That subdirectory is erased at the end of mrmini
+# temporary files for MondoRescue tools. That subdirectory is erased at the end of execution
 #
+#  Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here.
+#  Value: Full path of the temporary directory
+#  Example: 
 mr_tmp_dir default = /tmp
 
+# =item B<mr_cmdline>
 #
-# Location of some configuration files
+# Location of the file containing the boot command line for the OS
 #
-# depends on genre
+#  Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here.
+#  Value: comma separated list of URLs that point to repository files, or packages to install. The values may not include substitutions.
+#  Example: 
 mr_cmdline linux = /proc/cmdline
 mr_cmdline bsd = /tmp/cmdline
 # TBC
 mr_cmdline solaris = /proc/cmdline
+#
+
+# =item B<TO BE DOCUMENTED LATER>
 #
 mr_etc_fstab default = /etc/fstab
@@ -64 +92 @@
 mr_cmd_lvm default = /usr/sbin/lvm
 mr_path_lvm default = /usr/sbin/
+
+# =back
+
+# =head1 COPYRIGHT
+
+# (c) B. Cornec 2007-2014
+#
+# Provided under the Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) Creative Common License
+
+# =cut

branches/3.2/mindi/install.sh

@@ -55 +55 @@
 fi
 if [ _"$SBINDIR" = _"" ]; then
+    subsbin=$local/sbin
     SBINDIR=$local/sbin
 else
+    subsbin=$SBINDIR
     SBINDIR=${HEAD}$SBINDIR
 fi
@@ -98 +100 @@
     install -m 644 $s.8 $MANDIR
     # Generate the list of perl modules needed at restore time for mindi
-    cat > $conf/perl-scripts << EOF
-$SBINDIR/$s
+    cat >> $conf/perl-scripts << EOF
+$subsbin/$s
 EOF
 done

branches/3.2/mindi/mindi

@@ -2641 +2641 @@
 
     # Management of perl scripts delivered needed at restore time
-    mindi-get-perl-modules `cat $MINDI_CONF/perl-scripts` > $MINDI_TMP/perl.lis
+    mindi-get-perl-modules `cat $MINDI_CONF/perl-scripts` /usr/bin/mr-* > $MINDI_TMP/perl.lis
     tar cf - `cat $MINDI_TMP/perl.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "ERROR: Problem in perl scripts analysis" $MINDI_TMP/$$.log