Changeset 2667 in MondoRescue for devel

Timestamp:

Jun 27, 2010, 3:27:16 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3936@dhcp184-49-175-19: bruno | 2010-06-26 09:48:04 +0200

• Inventory now in better shape. Needs useful and exhaustive content now.

Location:

devel

Files:

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

devel/mr/etc/mondorescue.conf

@@ -16 +16 @@
 
 #
-# Location of the fstab file
+# Location of some configuration files
+#
+# depends on genre
+mr_cmdline linux = /proc/cmdline
+mr_cmdline bsd = /tmp/cmdline
+# TBC
+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
+
+# Location of some commands
+#
+mr_mount linux = /bin/mount
+mr_df linux = /bin/df
+mr_lsmod linux = /sbin/lsmod
 
 #

devel/mr/lib/MondoRescue/Base.pm

@@ -117 +117 @@
 =item B<mr_conf_get>
 
-This function get parameters in configuration files and returns from the least significant level (default) to the emost significant level (application name), passing by the project name.
+This function get parameters in configuration files and returns from the least significant level (default) to the most significant level (application name), passing by the project name.
 It takes a list of parameters to find and returns the values corresponding
 

devel/mr/lib/MondoRescue/Inventory.pm

@@ -19 +19 @@
 use ProjectBuilder::Base;
 use ProjectBuilder::Conf;
+use ProjectBuilder::Distribution;
+use MondoRescue::LVM;
+use MondoRescue::Kernel;
 
 # Inherit from the "Exporter" module which handles exporting functions.
@@ -28 +31 @@
 
 our @ISA = qw(Exporter);
-our @EXPORT = qw(mr_exit);
+our @EXPORT = qw(mr_inv_os $mr_os);
+
+# Globals
+our %mr_hw;
+our $mr_hw = \%mr_hw;
+our %mr_os;
+our $mr_os = \%mr_hw;
 
 =pod
@@ -66 +75 @@
 }
 
-sub mr_inv_hw_context {
+sub mr_inv_os {
 
-my %pb;
-my ($ddir, $dver, $dfam);
-my $cmdline = "/dev/null";
-($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'suf'}, $pb{'upd'}, $pb{'arch'}) = pb_distro_init();
-pb_log(2,"DEBUG: distro tuple: ".Dumper($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'suf'})."\n");
+($mr_os->{'name'}, $mr_os->{'version'}, $mr_os->{'family'}, $mr_os->{'type'}, $mr_os->{'os'}, $mr_os->{'suffix'}, $mr_os->{'update'}, $mr_os->{'arch'}) = pb_distro_init();
 
-if (($pb{{'dtype'} eq "rpm") || ($pb{{'dtype'} eq "deb") || ($pb{{'dtype'} eq "ebuild") || ($pb{{'dtype'} eq "tgz")) {
-    cmdline = "/proc/cmdline";
-} elsif ($pb{{'dtype'} eq "pkg") {
-    cmdline = "/proc/cmdline";
+# 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") {
+    my $key = $p;
+    $key =~ s/mr_//;
+    my ($pp) = pb_conf_get_if($p);
+    if (defined $pp) {
+        my $file = pb_distro_get_param($mr_os->{'name'},$mr_os->{'version'},$mr_os->{'arch'},$pp,$mr_os->{'family'},$mr_os->{'type'},$mr_os->{'os'});
+        if (-r $file) {
+            pb_log(2,"DEBUG: File found: $file\n");
+            $mr_os->{'files'}->{$key} = pb_get_content($file);
+        } else {
+            pb_log(2,"WARNING: $file not found\n");
+        }
+    }
 }
-return(pb_get_content($cmdline));
+
+# Get some commands result content when they exist; Depends on genre or more precise tuple
+for my $p ("mr_mount","mr_lsmod","mr_df") {
+    my $key = $p;
+    $key =~ s/mr_//;
+    my ($pp) = pb_conf_get_if($p);
+    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`;
+    }
+}
+# 
+# LVM setup
+#
+($mr_os->{'lvmver'},$mr_os->{'$lvmcmd'}) = mr_lvm_check();
+
+# Summary of conf printed.
+pb_log(1,"OS Inventory: ".Dumper($mr_os)."\n");
 }
 

devel/mrmini/etc/mrmini.conf

@@ -91 +91 @@
 
 #
+# type of bootloader. Key is ostype-arch
+#
+mr_bootloader rpm-i386 = lilo,grub
+mr_bootloader rpm-ia64 = elilo
+mr_bootloader deb-i386 = lilo,grub
+mr_bootloader deb-ia64 = elilo
+mr_bootloader ebuild-i386 = lilo,grub
+mr_bootloader ebuild-ia64 = elilo
+mr_bootloader tgz-i386 = lilo,grub
+mr_bootloader tgz-ia64 = elilo
+mr_bootloader port-i386 = unknown
+mr_bootloader port-ia64 = unknown
+mr_bootloader pkg-i386 = unknown
+
+#
 # Location of the logfile
 #

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

@@ -20 +20 @@
 use MondoRescue::Base;
 use MondoRescue::LVM;
+use MondoRescue::Inventory;
 
 # Inherit from the "Exporter" module which handles exporting functions.
@@ -79 +80 @@
 pb_log(0,"$ARCH architecture detected\n");
 pb_log(0,"$ENV{'PBPKG'} called with the following arguments: ".join(" ",@ARGV)."\n");
-pb_log(0,$sep);
+pb_log(1,$sep);
 pb_log(1,"CONFDIR: $mr->{'confdir'}\n");
 pb_log(1,"SBIN: $mr->{'install_dir'}/sbin\n");
@@ -92 +93 @@
     pb_display_file("$mr->{'confdir'}/mondorescue.conf",$pbLOG);
 }
-pb_log(0,$sep);
 
 #
 # Prepare cache dir
 #
+# To be checked more
 pb_rm_rf("$mr->{'cache_dir'}/*");
 pb_mkdir_p($mr->{'cache_dir'});
@@ -103 +104 @@
 my $mrmini_deplist = "$mr->{'confdir'}/deplist.d";
 
-# 
-# LVM setup
-#
-my ($lvmver,$lvmcmd) = mr_lvm_check();
-
-pb_log(0,"LVM $lvmver command set to $lvmcmd\n");
-pb_log(0,$sep);
+# Full OS inventory
+mr_inv_os();
 }

devel/mrmini/sbin/mrmini

@@ -159 +159 @@
 # ---------------------------------------------------------------------------
 
-# Initialize the syntax string
+# Catch signals
+$SIG{INT} = \&mr_exit;
+$SIG{QUIT} = \&mr_exit;
+$SIG{ABRT} = \&mr_exit;
+$SIG{KILL} = \&mr_exit;
+$SIG{TERM} = \&mr_exit;
 
 #
@@ -176 +181 @@
 ($mr->{'install_dir'},$mr->{'version'}) =  mr_conf_get("mr_install_dir","mr_version");
 
+# Initialize the syntax string
 pb_syntax_init("$ENV{'PBPKG'} Version $mr->{'version'}\n");
 pb_display_init("text","");