Changeset 2540 in MondoRescue for devel

Timestamp:

Jan 9, 2010, 4:40:53 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3576@localhost: bruno | 2010-01-08 01:15:36 +0100
First set of correct split packages. Now need to work on content. mranalyze-lvm is now executable.

Location:

devel

Files:

• mindi/Makefile.PL (modified) (1 diff)
• mindi/etc/mindi.conf (copied) (copied from devel/mindi/etc/mondorescue.conf ) (2 diffs)
• mindi/post-install.sh (modified) (1 diff)
• mindi/sbin/mindi (modified) (1 diff)
• mindi/sbin/mrprepare-lvm (modified) (1 diff)
• mr/etc/mondorescue.conf (moved) (moved from devel/mindi/etc/mondorescue.conf ) (3 diffs)
• mr/lib/MondoRescue/Base.pm (modified) (3 diffs)
• mr/lib/MondoRescue/LVM.pm (modified) (2 diffs)
• mr/post-install.sh (modified) (2 diffs)
• mr/sbin/mranalyze-lvm (modified) (2 diffs)
• mr/sbin/mrcheck-lvm (modified) (1 diff)

devel/mindi/Makefile.PL

@@ -16 +16 @@
     #ABSTRACT_FROM => 'sbin/mindi',   # retrieve abstract from module
     AUTHOR        => 'Bruno Cornec <bruno#mondorescue.org>',
-    EXE_FILES     => [ qw( sbin/mindi sbin/mranalyze-lvm sbin/mrprepare-lvm ) ],
+    EXE_FILES     => [ qw( sbin/mindi sbin/mrprepare-lvm ) ],
     MAN1PODS      => { 
             'sbin/mindi' => '$(INST_MAN1DIR)/mindi.$(MAN1EXT)', 

devel/mindi/etc/mindi.conf

@@ -47 +47 @@
 mr_cache_dir mindi = /var/cache/mindi
 mr_cache_dir mondoarchive = /var/cache/mondo
-
-#
-# Temporary directory
-# Under it a temporary directory will be created to host all
-# temporary files for mindi. That subdirectory is erased at the end of mindi
-#
-mr_tmp_dir default = /tmp
 
 #
@@ -131 +124 @@
 e.g. Type 'nuke donteject textonly' if you have an unstable Newt library and \n\
 a PC whose CD-ROM drive tray would be damaged if it unexpectedly ejected.\n
-
-# 
-# LVM commands and conf files
-# Is it LSB ?
-#
-mr_lvmdiskscan mindi = /usr/sbin/lvmdiskscan
-mr_lvmprocfile mindi = /proc/lvm/global
-mr_lvmcmd mindi = /usr/sbin/lvm 
-mr_lvmpath mindi = /usr/sbin/

devel/mindi/post-install.sh

@@ -32 +32 @@
 MINDIREV=PBREV
 ARCH=`/bin/uname -m`
-echo "mindi ${MINDIVER}-r${MINDIREV} will be installed under $local"
+echo "PBPKG ${MINDIVER}-r${MINDIREV} will be installed under $local"
 
 echo "Creating target directories ..."
 install -m 755 -d $conf $sublocallib $sublocalshare $CACHEDIR
 
-#echo "Copying files ..."
-#cp -af rootfs $sublocallib/mindi
-#chmod 755 $sublocallib/mindi/rootfs/sbin/*
-#install -m 644 msg-txt dev.tgz $sublocallib/mindi
+echo "Copying files ..."
+cp -a etc/PBPKG.conf $conf
+#cp -af rootfs $sublocallib
+#chmod 755 $sublocallib/rootfs/sbin/*
+#install -m 644 msg-txt dev.tgz $sublocallib
 #install -m 644 deplist.txt udev.files proliant.files $conf
 
 # Substitute variables for mindi
-sed -i -e "s~^MINDI_PREFIX=XXX~MINDI_PREFIX=$sublocal~" -e "s~^MINDI_CONF=YYY~MINDI_CONF=$subconf~" -e "s~^MINDI_LIB=LLL~MINDI_LIB=$sublocallib~" $local/bin/mindi
+sed -i -e "s~^MINDI_PREFIX=XXX~MINDI_PREFIX=$sublocal~" -e "s~^MINDI_CONF=YYY~MINDI_CONF=$subconf~" -e "s~^MINDI_LIB=LLL~MINDI_LIB=$sublocallib~" $local/bin/PBPKG
 #sed -i -e "s~= "YYY"~= "$subconf"~" $local/bin/mindi-bkphw
 
 if [ "$PKGBUILDMINDI" != "true" ]; then
-    chown -R root:root $sublocallib/mindi $conf
+    chown -R root:root $sublocallib $conf
 fi
 

devel/mindi/sbin/mindi

@@ -25 +25 @@
 use ProjectBuilder::Distribution;
 use ProjectBuilder::Display;
-use MondoRescue::Mindi::LVM;
+use MondoRescue::LVM;
 use MondoRescue::Base;
 

devel/mindi/sbin/mrprepare-lvm

@@ -19 +19 @@
 use ProjectBuilder::Distribution;
 use MondoRescue::Base;
-use MondoRescue::Mindi::LVM;
+use MondoRescue::LVM;
 
 =pod

devel/mr/etc/mondorescue.conf

@@ -9 +9 @@
 # mindi instable or cause failures. Use with care.
 
-#
-# Extra space for Ram disk
-#
-mr_extra_space mindi =  24576
-
-#
-# Size of the boot image
-#
-mr_boot_size mindi =  16384
-
-#
-# deplist file name (stored in $MINDI_CONF)
-#
-mr_deplist_file mindi = deplist.txt
-
-#
-# Write mindi CD (true|false) ?
-#
-mr_boot_cd mindi = true
-
-#
-# Write mindi USB (true|false) ?
-#
-mr_boot_usb mindi = false
-
-#
-# Write mindi Tape (true|false) ?
-#
-mr_boot_tape mindi = false
-
-#
-# Images creation dir
-# WARNING: This directory is erased before usage
-# This is also the directory mondoarchive will use to find 
-# what it needs to create it rescue media
-#
-mr_cache_dir mindi = /var/cache/mindi
-mr_cache_dir mondoarchive = /var/cache/mondo
-
-#
 # Temporary directory
 # Under it a temporary directory will be created to host all
@@ -56 +16 @@
 
 #
-# USB Disk Device
-#
-mr_usb_device default = /dev/sda1
-
-#
-# Tape Device
-#
-mr_tape_device default = /dev/st0
-
-#
-# Additional Boot Parameters
-# You may want to remove acpi=off if you're unable to reboot on mindi's CD
-# You may want to add ramdisk_size=1024 if on Fedora Core 5/6
-#
-mr_boot_params mindi = acpi=off apm=off devfs=nomount exec-shield=0 noresume selinux=0 barrier mindi = off
-
-#  
-# Kernel to use (NATIVE|FAILSAFE|PATH TO THE KERNEL)
-#
-mr_kernel default = NATIVE
-#mr_kernel mindi = /boot/vmlinuz.special
-
-#
-# Modules supported by mindi and required at boot time 
-#
-mr_scsi_mods mindi = 3w-xxxx 3w_xxxx 53c7,8xx a100u2w a320raid aacraid advansys aha152x aha1542 aha1740 aic79xx aic79xx_mod aic7xxx aic7xxx_mod aic7xxx_old AM53C974 atp870u BusLogic cciss cpqfc dmx3191d dpt_i2o dtc eata eata_dma eata_pio fdomain gdth g_NCR5380 i2o_block i2o_core ide-scsi ieee1394 imm in2000 initio ips iscsi isp megaraid mptbase mptscsih mptsas mptspi mptfc mptscsi mptctl NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qla2200 qla2300 qlogicfas qlogicfc qlogicisp raw1394 scsi_debug scsi_mod sd_mod seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs
-mr_ide_mods mindi = ide ide-generic ide-detect ide-mod ide-disk ide-cd ide_cd ide-cs ide-core ide_core edd paride ata_piix libata via82cxxx generic nvidia ahci sata_nv cmd64x
-mr_usb_mods mindi = usb-storage usb-ohci usb-uhci usbcore usb_storage hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd ohci-hcd ohci_hcd usbkbd usbhid
-mr_pcmcia_mods mindi = pcmcia_core ds yenta_socket
-mr_cdrom_mods mindi = cdrom isocd isofs inflate_fs nls_iso8859-1 nls_cp437 sg sr_mod zlib_inflate
-mr_tape_mods mindi = ht st osst ide-tape ide_tape
-mr_floppy_mods mindi = ide-floppy floppy
-mr_net_mods mindi = sunrpc nfs nfs_acl lockd loop mii 3c59x e100 bcm5700 bnx2 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 vmxnet vmnet
-mr_extra_mods mindi = vfat fat loop md-mod linear raid0 raid1 xor raid5 lvm-mod dm-mod dm-snapshot dm-zero dm-mirror jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd mbcache
-#  
-# Additional modules to support 
-# (white space separated list of modules)
-#
-mr_force_mods mindi = 
-mr deny_mods mindi = 
-
-#
 # Location of the fstab file
 #
 mr_fstab default = /etc/fstab
-
-#
-# Location of the logfile
-#
-mr_log_file mindi = /var/log/mindi.log
-mr_log_file mondoarchive = /var/log/mondoarchive.log
-mr_log_file mondorestore = /var/log/mondorestore.log
-
-#
-# Interactive mode (true|false)
-#
-mr_interactive mindi = true
-
-#
-# Boot message shown during media boot
-#
-mr_boot_msg mindi = \
-To format and restore all files automatically, type 'nuke' <enter>.\n\
-To restore some/all files interactively, type 'interactive' <enter>.\n\
-To compare the archives with your filesystem, type 'compare' <enter>.\n\
-To boot to a command-line prompt (expert mode), type 'expert' <enter>.\n\
-You may add one or more of the following parameters as well:-\n\n\
-        donteject - mondorestore will not eject the CD; this is useful if, for\n\
-                    instance, your PC's case has a concealed CD-ROM drive\n\
-        noresize  - your mountlist will not be adjusted to use your unallocated\n\
-                    hard disk space\n\
-        textonly  - do not call any Newt library routines; this is unattractive\n\
-                    but valuable if you find your Newt library has bugs in it\n\n\
-e.g. Type 'nuke donteject textonly' if you have an unstable Newt library and \n\
-a PC whose CD-ROM drive tray would be damaged if it unexpectedly ejected.\n
 
 # 
@@ -136 +24 @@
 # Is it LSB ?
 #
-mr_lvmdiskscan mindi = /usr/sbin/lvmdiskscan
-mr_lvmprocfile mindi = /proc/lvm/global
-mr_lvmcmd mindi = /usr/sbin/lvm 
-mr_lvmpath mindi = /usr/sbin/
+mr_lvmdiskscan default = /usr/sbin/lvmdiskscan
+mr_lvmprocfile default = /proc/lvm/global
+mr_lvmcmd default = /usr/sbin/lvm   
+mr_lvmpath default = /usr/sbin/

devel/mr/lib/MondoRescue/Base.pm

@@ -19 +19 @@
 use ProjectBuilder::Base;
 use ProjectBuilder::Conf;
+use MondoRescue::DynConf;
 
 # Inherit from the "Exporter" module which handles exporting functions.
@@ -51 +52 @@
 =cut
 
-sub mr_exit {
+sub mr_init {
 
 my $msg = shift || "";
@@ -60 +61 @@
 
 # Get the various location determined at installation time
-my ($confdir,$localdir,$pbproj) = mr_dyn_conf();
+my ($confdir,$localdir,$pbproj) = mr_dynconf_init();
 
 # First use the main configuration file
-pb_conf_add("$confdir/$pbproj/$pbproj.conf");
+pb_conf_init($pbproj);
+pb_conf_add("$confdir/$pbproj.conf");
 }
 

devel/mr/lib/MondoRescue/LVM.pm

@@ -8 +8 @@
 # Provided under the GPL v2
 
-package MondoRescue::Mindi::LVM;
+package MondoRescue::LVM;
 
 use strict 'vars';
@@ -53 +53 @@
 # Get params from the conf file
 my ($lvmds_t,$lvmproc_t,$lvmcmd_t,$lvmpath_t) = pb_conf_get("mr_lvmdiskscan","mr_lvmprocfile","mr_lvmcmd","mr_lvmpath");
-my $lvmds = $lvmds_t->{'mindi'};
-my $lvmproc = $lvmproc_t->{'mindi'};
-my $lvmcmd = $lvmcmd_t->{'mindi'};
-my $lvmpath = $lvmpath_t->{'mindi'};
+my $lvmds = $lvmds_t->{$ENV{PBPROJ}};
+my $lvmproc = $lvmproc_t->{$ENV{PBPROJ}};
+my $lvmcmd = $lvmcmd_t->{$ENV{PBPROJ}};
+my $lvmpath = $lvmpath_t->{$ENV{PBPROJ}};
 
 if (! -x $lvmproc) {

devel/mr/post-install.sh

@@ -44 +44 @@
 
 cp etc/PBPROJ.conf $conf
-cat > $PERLDIR/MondoRescue/DynConf.pm << EOF
+cat > $HEAD$PERLDIR/MondoRescue/DynConf.pm << EOF
 #!/usr/bin/perl -w
 #
@@ -69 +69 @@
 sub mr_dynconf_init {
 
-return($subconf,$sublocal,"PBPROJ");
+return("$subconf","$sublocal","PBPROJ");
 }
 1;

devel/mr/sbin/mranalyze-lvm

@@ -19 +19 @@
 use ProjectBuilder::Distribution;
 use MondoRescue::Base;
-use MondoRescue::Mindi::LVM;
+use MondoRescue::LVM;
 
 =pod
@@ -133 +133 @@
 pb_temp_init();
 
+# MondoRescue init
+mr_init();
+
 # -------------------------------- main -----------------------------------
 # Where to send the output

devel/mr/sbin/mrcheck-lvm

@@ -19 +19 @@
 use ProjectBuilder::Distribution;
 use MondoRescue::Base;
-use MondoRescue::Mindi::LVM;
+use MondoRescue::LVM;
 
 =pod