Changeset 2667 in MondoRescue for devel/mrmini

Timestamp:

Jun 27, 2010, 3:27:16 PM (14 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/mrmini

Files:

• etc/mrmini.conf (modified) (1 diff)
• lib/MondoRescue/Mini/Base.pm (modified) (4 diffs)
• sbin/mrmini (modified) (2 diffs)

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","");