Changeset 2650 in MondoRescue for devel/mrmini

Timestamp:

Jun 13, 2010, 12:36:38 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3875@localhost: bruno | 2010-06-12 12:31:38 +0200

• Review completely the installation process for mrmini, and first packages buildable

Location:

devel/mrmini

Files:

• etc/mrmini.conf (moved) (moved from devel/mrmini/etc/mindi.conf )
• post-install.sh (deleted)
• sbin/mrmini (moved) (moved from devel/mrmini/sbin/mrmindi ) (3 diffs)
• sbin/mrmini-bkphw (moved) (moved from devel/mrmini/sbin/mindi-bkphw )

devel/mrmini/sbin/mrmini

@@ -57 +57 @@
 # Handle options
 #
+
+=pod
+=over 4
+=item B<-v|--verbose>
+
+Print a brief help message and exits.
+
+=item B<-q|--quiet>
+
+Do not print any output.
+
+=item B<-h|--help>
+
+Print a brief help message and exits.
+
+=item B<--man>
+
+Prints the manual page and exits.
+
+=item B<-i|--iso iso_image>
+
+Name of the ISO image you want to created.
+
+=item B<-u|--usb usb_device>
+
+Name of the USB device on which you want to created your image.
+
+=item B<-t|--tape tape_device>
+
+Name of the Tape device on which you want to created your image.
+
+=item B<-o|--obdr>
+
+Activate OBDR mode for tape (Bootable tape devices)
+
+=item B<-V|--version>
+
+Display mrmini version and exit
+
+=item B<-f|--force>
+
+Force usage of defaults parameters or values without asking questions
+
+=item B<-p|--printvars variable>
+
+Prints the value of the variable passed as parameter
+
+=cut
 GetOptions(
-
-=over 4
-
-=cut
         "verbose|v+" => \$opts{'v'},
-
-=item B<-v|--verbose>
-
-Print a brief help message and exits.
-
-=cut
         "quiet|q" => \$opts{'q'},
-
-=item B<-q|--quiet>
-
-Do not print any output.
-
-=cut
         "help|?|h" => \$opts{'h'}, 
-
-=item B<-h|--help>
-
-Print a brief help message and exits.
-
-=cut
         "man" => \$opts{'man'},
-
-=item B<--man>
-
-Prints the manual page and exits.
-
-=cut
         "iso|i=s" => \$opts{'i'},
-
-=item B<-i|--iso iso_image>
-
-Name of the ISO image you want to created.
-
-=cut
         "usb|u=s" => \$opts{'u'},
-
-=item B<-u|--usb usb_device>
-
-Name of the USB device on which you want to created your image.
-
-=cut
         "tape|t=s" => \$opts{'t'},
-
-=item B<-t|--tape tape_device>
-
-Name of the Tape device on which you want to created your image.
-
-=cut
         "obdr|o" => \$opts{'o'},
-
-=item B<-o|--obdr>
-
-Activate OBDR mode for tape (Bootable tape devices)
-
-=cut
         "version|V" => \$opts{'V'},
-
-=item B<-V|--version>
-
-Display mrmini version and exit
-
-=cut
         "force|f" => \$opts{'f'},
-
-=item B<-f|--force>
-
-Force usage of defaults parameters or values without asking questions
-
-=cut
         "printvar|p=s" => \$opts{'p'},
-
-=item B<-p|--printvars variable>
-
-Prints the value of the variable passed as parameter
-
-=cut
         "log-files|l=s" => \$opts{'l'},
 ) || pb_syntax(-1,0);
 
+=pod
 =back 
 
@@ -215 +194 @@
 # Global variables
 #
+my ($MRMINI_PREFIX,$MRMINI_CONF,$MRMINI_LIB) = mr_setup_var();
 my $MRMINI_VERSION = "PBVER-rPBREV";
-my $MRMINI_PREFIX = "XXX";
-my $MRMINI_CONF = "YYY";
-my $MRMINI_LIB = "LLL";
 my $MRMINI_SBIN = "$MRMINI_PREFIX/sbin";
 my $MRMINI_FDISK = "$MRMINI_SBIN/parted2fdik";
@@ -231 +208 @@
 pb_temp_init();
 
-#
-# Conf files Management
-# the $MRMINI_CONF/mondorescue.conf.dist is delivered as part of the project and
-# its checksum is verified as we need good default values that we can trust
-#
-open(MD5,"$MRMINI_CONF/mondorescue.conf.dist.md5") || die "Unable to read mandatory $MRMINI_CONF/mondorescue.conf.dist.md5: $!";
-my $omd5 = <MD5>;
-chop($omd5);
-close(MD5);
-open(CONF,"$MRMINI_CONF/mondorescue.conf.dist") || die "Unable to read mandatory $MRMINI_CONF/mondorescue.conf.dist: $!";
-my $md5 = Digest::MD5->new;
-binmode(CONF);
-$md5->addfile(CONF);
-die "Invalid MD5 found sum for $MRMINI_CONF/mondorescue.conf.dist: $md5->hexdigest" if ($omd5 ne $md5->hexdigest);
-close(CONF);
-
 # Adds conf files in order
-pb_conf_add("$ENV{'HOME'}/.mondorescuerc","$MRMINI_CONF/mondorescue.conf","$MRMINI_CONF/mondorescue.conf.dist");
+pb_conf_add("$ENV{'HOME'}/.mondorescuerc","$MRMINI_CONF/mondorescue.conf");
 
 #