Changeset 3110 in MondoRescue

Timestamp:

May 5, 2013, 4:48:59 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Store a status for devel ersion of mondo

Location:

devel

Files:

• mr/lib/MondoRescue/Inventory.pm (modified) (5 diffs)
• mrmini/lib/MondoRescue/Mini/Base.pm (modified) (3 diffs)
• mrmini/sbin/mrmini (modified) (3 diffs)

devel/mr/lib/MondoRescue/Inventory.pm

@@ -15 +15 @@
 use File::Basename;
 use File::Copy;
-use POSIX qw(strftime);
+use POSIX qw(strftime uname);
 use lib qw (lib);
 use ProjectBuilder::Base;
@@ -76 +76 @@
 sub mr_inv_os {
 
-($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();
+$mr_os->{'pbos'} = pb_distro_init();
+
+pb_log(2,"OS Inventory: pbos ".Dumper($mr_os)."\n");
+
+# Get some running kernel info
+($mr_os->{'uname'}->{'sysname'}, $mr_os->{'uname'}->{'nodename'}, $mr_os->{'uname'}->{'release'}, $mr_os->{'uname'}->{'version'}, $mr_os->{'uname'}->{'machine'}) = uname();
+
+pb_log(2,"OS Inventory: uname ".Dumper($mr_os)."\n");
 
 # Get some conf file content when they exist; Depends on genre or more precise tuple
-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") {
+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") {
     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'});
+        my $file = pb_distro_get_param($mr_os->{'pbos'},$pp);
         if (-r $file) {
             pb_log(2,"DEBUG: File found: $file\n");
@@ -94 +101 @@
 }
 
+pb_log(2,"OS Inventory: files ".Dumper($mr_os)."\n");
+
+return;
 # Get some commands result content when they exist; Depends on genre or more precise tuple
 for my $p ("mr_cmd_mount","mr_cmd_df","mr_cmd_dmidecode","mr_cmd_lshw") {
@@ -101 +111 @@
     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'});
+        my $cmd = pb_distro_get_param($mr_os->{'pbos'},$pp);
         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));
+        $opt = pb_distro_get_param($mr_os->{'pbos'},$po) if (defined ($po));
         if (-x $cmd) {
             pb_log(2,"DEBUG: Cmd found: $cmd $opt\n");
@@ -112 +122 @@
     }
 }
+
+pb_log(2,"OS Inventory: cmds ".Dumper($mr_os)."\n");
 # 
 # LVM setup

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

@@ -62 +62 @@
 chomp($ARCH);
 
-pb_conf_add("$mr->{'confdir'}/$ENV{'PBPROJ'}.conf.dist");
 ($mr->{'boot_size'},$mr->{'boot_cd'},$mr->{'boot_usb'},$mr->{'boot_tape'},$mr->{'kernel'},$mr->{'fstab'}) =  mr_conf_get("mr_boot_size","mr_boot_cd","mr_boot_usb","mr_boot_tape","mr_kernel","mr_fstab");
 ($mr->{'tape_mods'},$mr->{'scsi_mods'},$mr->{'ide_mods'},$mr->{'pcmcia_mods'},$mr->{'usb_mods'},$mr->{'net_mods'},$mr->{'cdrom_mods'},$mr->{'deny_mods'},$mr->{'force_mods'}) =  mr_conf_get("mr_tape_mods","mr_scsi_mods","mr_ide_mods","mr_pcmcia_mods","mr_usb_mods","mr_net_mods","mr_cdrom_mods","mr_extra_mods","mr_deny_mods","mr_force_mods");
 ($mr->{'cache_dir'},$mr->{'boot_msg'},$mr->{'burn_cmd'},$mr->{'burn_opt'}) = mr_conf_get("mr_cache_dir","mr_boot_msg","mr_burn_cmd","mr_burn_opt");
-
-#
-# Manage log file
-#
-$pbLOG = $mr->{'logdesc'};
-$pbdebug = 1  if ($pbdebug == -1);
-pb_log_init($pbdebug, $pbLOG);
 
 my $sep = "-----------------------------------------------\n";
@@ -86 +78 @@
     pb_log(0,$sep);
     pb_log(0,"Conf file $ENV{'HOME'}/.mondorescuerc\n");
-    pb_display_file("$ENV{'HOME'}/.mondorescuerc",$pbLOG);
+    pb_display_file("$ENV{'HOME'}/.mondorescuerc",$mr->{'logdesc'}) if ($pbdebug ge 0);
 }
 if (-r "$mr->{'confdir'}/mondorescue.conf") {
     pb_log(0,$sep);
     pb_log(0,"Conf file $mr->{'confdir'}/mondorescue.conf\n");
-    pb_display_file("$mr->{'confdir'}/mondorescue.conf",$pbLOG);
+    pb_display_file("$mr->{'confdir'}/mondorescue.conf",$mr->{'logdesc'}) if ($pbdebug ge 0);
 }
 
@@ -105 +97 @@
 
 # Full OS inventory
+pb_log(0,$sep);
 mr_inv_os();
 }

devel/mrmini/sbin/mrmini

@@ -169 +169 @@
 # Global variables
 #
-my $proj;
-($mr->{'confdir'},$proj) = mr_dynconf_init();
-my @date = pb_get_date();
-$mr->{'start_date'} = strftime("%Y-%m-%d %H:%M:%S", @date);
-
-$ENV{'PBPROJ'} = $proj;
+mr_init();
 $ENV{'PBPKG'} = "mrmini";
 
 # Adds conf files in order
-pb_conf_add("$mr->{'confdir'}/mondorescue.conf.dist","$mr->{'confdir'}/mondorescue.conf");
 ($mr->{'install_dir'},$mr->{'version'}) =  mr_conf_get("mr_install_dir","mr_version");
 
@@ -193 +187 @@
 }
 if (defined $opts{'p'}) {
-    pb_display("$ENV{$opts{'p'}}\n");
+    print("$ENV{$opts{'p'}}\n");
     exit(0);
 }
@@ -230 +224 @@
 }
 
-# 
-# Temp dir
-#
-pb_temp_init();
+pb_log_init($pbdebug,$mr->{'logdesc'});
 mr_mini_main();
 mr_exit(0);