Changeset 2668 in MondoRescue

Timestamp:

Jul 1, 2010, 5:08:50 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3939@athonet: bruno | 2010-06-30 16:50:32 +0200
Renaming of conf file parameters to be more specific

Location:

devel

Files:

• mr/etc/mondorescue.conf (modified) (1 diff)
• mr/lib/MondoRescue/Inventory.pm (modified) (5 diffs)
• mr/lib/MondoRescue/Kernel.pm (modified) (4 diffs)
• mrmini/lib/MondoRescue/Mini/Base.pm (modified) (1 diff)

devel/mr/etc/mondorescue.conf

@@ -24 +24 @@
 mr_cmdline solaris = /proc/cmdline
 #
-mr_fstab default = /etc/fstab
-mr_raidtab linux = /etc/raidtab
-mr_swap linux = /proc/swaps
-mr_partitions linux = /proc/partitions
-mr_filesystems linux = /proc/filesystems
-mr_modules linux = /proc/modules
-mr_xen linux = /proc/sys/xen
+mr_etc_fstab default = /etc/fstab
+mr_etc_raidtab linux = /etc/raidtab
+mr_proc_partitions linux = /proc/partitions
+mr_proc_filesystems linux = /proc/filesystems
+mr_proc_modules linux = /proc/modules
+mr_proc_cpuinfo linux = /proc/cpuinfo
+mr_proc_devices linux = /proc/devices
+mr_proc_meminfo linux = /proc/meminfo
+mr_proc_version linux = /proc/version
+mr_proc_mounts linux = /proc/mounts
+mr_proc_misc linux = /proc/misc
+mr_proc_swaps linux = /proc/swaps
+mr_proc_xen linux = /proc/sys/xen
 
 # Location of some commands
 #
-mr_mount linux = /bin/mount
-mr_df linux = /bin/df
-mr_lsmod linux = /sbin/lsmod
+mr_cmd_mount linux = /bin/mount
+mr_opt_mount linux = -l
+mr_cmd_df linux = /bin/df
+mr_opt_df linux = -TP
+mr_cmd_dmidecode linux = /usr/sbin/dmidecode
+mr_cmd_lshw linux = /usr/sbin/lshw
+# Pb of key here want both linux and mrmini or mondoarchive or ...
+mr_cmd_mkisofs linux = /usr/bin/mkisofs
 
 #

devel/mr/lib/MondoRescue/Inventory.pm

@@ -21 +21 @@
 use ProjectBuilder::Distribution;
 use MondoRescue::LVM;
-use MondoRescue::Kernel;
 
 # Inherit from the "Exporter" module which handles exporting functions.
@@ -80 +79 @@
 
 # Get some conf file content when they exist; Depends on genre or more precise tuple
-for my $p ("mr_cmdline","mr_fstab","mr_raidtab","mr_swap","mr_partitions","mr_filesystems","mr_modules","mr_xen") {
+for my $p ("mr_proc_cmdline","mr_etc_fstab","mr_etc_raidtab","mr_proc_swaps","mr_proc_partitions","mr_proc_filesystems","mr_proc_modules","mr_proc_xen","mr_proc_cpuinfo","mr_proc_devices","mr_proc_meminfo","mr_proc_misc","mr_proc_mounts","mr_proc_version") {
     my $key = $p;
     $key =~ s/mr_//;
@@ -90 +89 @@
             $mr_os->{'files'}->{$key} = pb_get_content($file);
         } else {
-            pb_log(2,"WARNING: $file not found\n");
+            pb_log(1,"WARNING: $file not found\n");
         }
     }
@@ -96 +95 @@
 
 # Get some commands result content when they exist; Depends on genre or more precise tuple
-for my $p ("mr_mount","mr_lsmod","mr_df") {
+for my $p ("mr_cmd_mount","mr_cmd_df","mr_cmd_dmidecode","mr_cmd_lshw") {
     my $key = $p;
-    $key =~ s/mr_//;
+    $key =~ s/mr_cmd_//;
     my ($pp) = pb_conf_get_if($p);
+    my ($po) = pb_conf_get_if("mr_opt_".$key);
     if (defined $pp) {
         my $cmd = pb_distro_get_param($mr_os->{'name'},$mr_os->{'version'},$mr_os->{'arch'},$pp,$mr_os->{'family'},$mr_os->{'type'},$mr_os->{'os'});
-        pb_log(2,"DEBUG: Cmd found: $cmd\n");
-        $mr_os->{'cmd'}->{$key} = `$cmd`;
+        my $opt = "";
+        $opt = pb_distro_get_param($mr_os->{'name'},$mr_os->{'version'},$mr_os->{'arch'},$po,$mr_os->{'family'},$mr_os->{'type'},$mr_os->{'os'}) if (defined ($po));
+        if (-x $cmd) {
+            pb_log(2,"DEBUG: Cmd found: $cmd $opt\n");
+            $mr_os->{'cmd'}->{$key} = `$cmd $opt`;
+        } else {
+            pb_log(1,"WARNING: $cmd not found\n");
+        }
     }
 }
@@ -109 +115 @@
 # LVM setup
 #
-($mr_os->{'lvmver'},$mr_os->{'$lvmcmd'}) = mr_lvm_check();
+($mr_os->{'lvmver'},$mr_os->{'lvmcmd'}) = mr_lvm_check();
 
 # Summary of conf printed.

devel/mr/lib/MondoRescue/Kernel.pm

@@ -12 +12 @@
 use strict 'vars';
 use Data::Dumper;
-use English;
 use lib qw (lib);
 use ProjectBuilder::Base;
 use ProjectBuilder::Conf;
 use MondoRescue::Base;
+use MondoRescue::Inventory;
 
 # Inherit from the "Exporter" module which handles exporting functions.
@@ -26 +26 @@
 
 our @ISA = qw(Exporter);
-our @EXPORT = qw(mr_kernel_check);
+our @EXPORT = qw(mr_kernel_get_version);
 
 =pod
@@ -42 +42 @@
 =over 4
 
-=item B<mr_kernel_check>
+=item B<mr_kernel_get_version>
 
 This function checks the kernel and returns back its version
@@ -50 +50 @@
 sub mr_kernel_get_version {
 
+my ($os,$ver,$kernelver,$rest);
+
+# By default we don't know how it works for other OSes
+$kernelver = "unknown";
+
+($os,$ver,$kernelver,$rest) = split(/ /,$mr_os->{'files'}->{'proc_version'}) if ($mr_os->{'os'} eq "linux");
+
+return($kernelver);
 }
 

devel/mrmini/lib/MondoRescue/Mini/Base.pm

@@ -56 +56 @@
 #
 # Checks
-die "mr->mini_conf not declared in environment" if (not defined $mr->{'confdir'});
+die "mr->confdir not declared in environment" if (not defined $mr->{'confdir'});
 
 # Better ?