Changeset 2540 in MondoRescue for devel/mr/lib
- Timestamp:
- Jan 9, 2010, 4:40:53 PM (14 years ago)
- Location:
- devel/mr/lib/MondoRescue
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/mr/lib/MondoRescue/Base.pm
r2539 r2540 19 19 use ProjectBuilder::Base; 20 20 use ProjectBuilder::Conf; 21 use MondoRescue::DynConf; 21 22 22 23 # Inherit from the "Exporter" module which handles exporting functions. … … 51 52 =cut 52 53 53 sub mr_ exit {54 sub mr_init { 54 55 55 56 my $msg = shift || ""; … … 60 61 61 62 # Get the various location determined at installation time 62 my ($confdir,$localdir,$pbproj) = mr_dyn _conf();63 my ($confdir,$localdir,$pbproj) = mr_dynconf_init(); 63 64 64 65 # First use the main configuration file 65 pb_conf_add("$confdir/$pbproj/$pbproj.conf"); 66 pb_conf_init($pbproj); 67 pb_conf_add("$confdir/$pbproj.conf"); 66 68 } 67 69 -
devel/mr/lib/MondoRescue/LVM.pm
r2538 r2540 8 8 # Provided under the GPL v2 9 9 10 package MondoRescue:: Mindi::LVM;10 package MondoRescue::LVM; 11 11 12 12 use strict 'vars'; … … 53 53 # Get params from the conf file 54 54 my ($lvmds_t,$lvmproc_t,$lvmcmd_t,$lvmpath_t) = pb_conf_get("mr_lvmdiskscan","mr_lvmprocfile","mr_lvmcmd","mr_lvmpath"); 55 my $lvmds = $lvmds_t->{ 'mindi'};56 my $lvmproc = $lvmproc_t->{ 'mindi'};57 my $lvmcmd = $lvmcmd_t->{ 'mindi'};58 my $lvmpath = $lvmpath_t->{ 'mindi'};55 my $lvmds = $lvmds_t->{$ENV{PBPROJ}}; 56 my $lvmproc = $lvmproc_t->{$ENV{PBPROJ}}; 57 my $lvmcmd = $lvmcmd_t->{$ENV{PBPROJ}}; 58 my $lvmpath = $lvmpath_t->{$ENV{PBPROJ}}; 59 59 60 60 if (! -x $lvmproc) {
Note:
See TracChangeset
for help on using the changeset viewer.