Changeset 3110 in MondoRescue for devel/mrmini/lib

Timestamp:

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

Author:

Bruno Cornec

Message:

• Store a status for devel ersion of mondo

File:

• devel/mrmini/lib/MondoRescue/Mini/Base.pm (modified) (3 diffs)

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();
 }