Changeset 2650 in MondoRescue for devel/mr/lib

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/mr/lib/MondoRescue

Files:

• Base.pm (modified) (2 diffs)
• LVM.pm (modified) (1 diff)

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