Changeset 2540 in MondoRescue for devel/mr/lib/MondoRescue

Timestamp:

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

Author:

Bruno Cornec

Message:

r3576@localhost: bruno | 2010-01-08 01:15:36 +0100
First set of correct split packages. Now need to work on content. mranalyze-lvm is now executable.

Location:

devel/mr/lib/MondoRescue

Files:

• Base.pm (modified) (3 diffs)
• LVM.pm (modified) (2 diffs)

devel/mr/lib/MondoRescue/Base.pm

@@ -19 +19 @@
 use ProjectBuilder::Base;
 use ProjectBuilder::Conf;
+use MondoRescue::DynConf;
 
 # Inherit from the "Exporter" module which handles exporting functions.
@@ -51 +52 @@
 =cut
 
-sub mr_exit {
+sub mr_init {
 
 my $msg = shift || "";
@@ -60 +61 @@
 
 # Get the various location determined at installation time
-my ($confdir,$localdir,$pbproj) = mr_dyn_conf();
+my ($confdir,$localdir,$pbproj) = mr_dynconf_init();
 
 # First use the main configuration file
-pb_conf_add("$confdir/$pbproj/$pbproj.conf");
+pb_conf_init($pbproj);
+pb_conf_add("$confdir/$pbproj.conf");
 }
 

devel/mr/lib/MondoRescue/LVM.pm

@@ -8 +8 @@
 # Provided under the GPL v2
 
-package MondoRescue::Mindi::LVM;
+package MondoRescue::LVM;
 
 use strict 'vars';
@@ -53 +53 @@
 # Get params from the conf file
 my ($lvmds_t,$lvmproc_t,$lvmcmd_t,$lvmpath_t) = pb_conf_get("mr_lvmdiskscan","mr_lvmprocfile","mr_lvmcmd","mr_lvmpath");
-my $lvmds = $lvmds_t->{'mindi'};
-my $lvmproc = $lvmproc_t->{'mindi'};
-my $lvmcmd = $lvmcmd_t->{'mindi'};
-my $lvmpath = $lvmpath_t->{'mindi'};
+my $lvmds = $lvmds_t->{$ENV{PBPROJ}};
+my $lvmproc = $lvmproc_t->{$ENV{PBPROJ}};
+my $lvmcmd = $lvmcmd_t->{$ENV{PBPROJ}};
+my $lvmpath = $lvmpath_t->{$ENV{PBPROJ}};
 
 if (! -x $lvmproc) {