Changeset 2539 in MondoRescue

Timestamp:

Jan 9, 2010, 4:40:49 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3573@localhost: bruno | 2010-01-08 00:15:20 +0100
Trying to improve the split of code between mr and mindi

Location:

devel

Files:

• mindi/Makefile.PL (modified) (1 diff)
• mr/Makefile.PL (modified) (1 diff)
• mr/lib/MondoRescue/Base.pm (modified) (1 diff)
• mr/post-install.sh (copied) (copied from devel/mindi/post-install.sh ) (3 diffs)
• mr/sbin/mranalyze-lvm (moved) (moved from devel/mindi/sbin/mranalyze-lvm )
• mr/sbin/mrcheck-lvm (added)

devel/mindi/Makefile.PL

@@ -19 +19 @@
     MAN1PODS      => { 
             'sbin/mindi' => '$(INST_MAN1DIR)/mindi.$(MAN1EXT)', 
-            'sbin/mranalyze-lvm' => '$(INST_MAN1DIR)/mranalyze-lvm.$(MAN1EXT)', 
             'sbin/mrprepare-lvm' => '$(INST_MAN1DIR)/mrprepare-lvm.$(MAN1EXT)', 
                     },
-    MAN3PODS      => {  
-            'lib/MondoRescue/Mindi/LVM.pm' => '$(INST_MAN3DIR)/MondoRescue::Mindi::LVM.$(MAN3EXT)',
-                    },
+    #MAN3PODS      => { 
+            #'lib/MondoRescue/Mindi/LVM.pm' => '$(INST_MAN3DIR)/MondoRescue::Mindi::LVM.$(MAN3EXT)',
+            #},
 );

devel/mr/Makefile.PL

@@ -16 +16 @@
     #ABSTRACT_FROM => 'bin/',   # retrieve abstract from module
     AUTHOR        => 'Bruno Cornec <bruno#mondorescue.org>',
-    EXE_FILES     => [ qw(  ) ],
+    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)', 
                 },
 );

devel/mr/lib/MondoRescue/Base.pm

@@ -59 +59 @@
 }
 
-pb_conf_init();
+# Get the various location determined at installation time
+my ($confdir,$localdir,$pbproj) = mr_dyn_conf();
+
+# First use the main configuration file
+pb_conf_add("$confdir/$pbproj/$pbproj.conf");
 }
+
 =item B<mr_exit>
 

devel/mr/post-install.sh

@@ -8 +8 @@
     sublocal=$PREFIX
     if [ "_$CONFDIR" != "_" ]; then
-        conf=${HEAD}$CONFDIR/PBPKG
-        subconf=$CONFDIR/PBPKG
+        conf=${HEAD}$CONFDIR/PBPROJ
+        subconf=$CONFDIR/PBPROJ
     else
         echo "CONFDIR should be defined if PREFIX is defined"
@@ -17 +17 @@
     local=/usr/local
     sublocal=$local
-    conf=$local/etc/PBPKG
+    conf=$local/etc/PBPROJ
     subconf=$conf
 fi
 
 if [ _"$CACHEDIR" = _"" ]; then
-    CACHEDIR=$local/var/cache/PBPKG
+    CACHEDIR=$local/var/cache/PBPROJ
 else
     CACHEDIR=${HEAD}$CACHEDIR
 fi
-sublocalshare="$local/share/PBPKG"
-sublocallib="$local/lib/PBPKG"
+sublocalshare="$local/share/PBPROJ"
+sublocallib="$local/lib/PBPROJ"
 
-MINDIVER=PBVER
-MINDIREV=PBREV
+MRVER=PBVER
+MRREV=PBREV
 ARCH=`/bin/uname -m`
-echo "mindi ${MINDIVER}-r${MINDIREV} will be installed under $local"
+echo "PBPROJ modules ${MRVER}-r${MRREV} will be installed under $local"
 
 echo "Creating target directories ..."
 install -m 755 -d $conf $sublocallib $sublocalshare $CACHEDIR
 
-#echo "Copying files ..."
+echo "Copying files ..."
 #cp -af rootfs $sublocallib/mindi
 #chmod 755 $sublocallib/mindi/rootfs/sbin/*
@@ -43 +43 @@
 #install -m 644 deplist.txt udev.files proliant.files $conf
 
-# Substitute variables for mindi
-sed -i -e "s~^MINDI_PREFIX=XXX~MINDI_PREFIX=$sublocal~" -e "s~^MINDI_CONF=YYY~MINDI_CONF=$subconf~" -e "s~^MINDI_LIB=LLL~MINDI_LIB=$sublocallib~" $local/bin/mindi
-#sed -i -e "s~= "YYY"~= "$subconf"~" $local/bin/mindi-bkphw
+cp etc/PBPROJ.conf $conf
+cat > $PERLDIR/MondoRescue/DynConf.pm << 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.
+#
+package MondoRescue::DynConf;
 
-if [ "$PKGBUILDMINDI" != "true" ]; then
-    chown -R root:root $sublocallib/mindi $conf
-fi
+use strict;
+
+# 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);
+
+# Returns in order
+# the CONFDIR
+# the LOCALDIR
+sub mr_dynconf_init {
+
+return($subconf,$sublocal,"PBPROJ");
+}
+1;
+EOF
 
 exit 0