Changeset 2540


Ignore:
Timestamp:
Jan 9, 2010, 4:40:53 PM (10 years ago)
Author:
bruno
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:
9 edited
1 copied
1 moved

Legend:

Unmodified
Added
Removed
  • devel/mindi/Makefile.PL

    r2539 r2540  
    1616    #ABSTRACT_FROM => 'sbin/mindi',   # retrieve abstract from module
    1717    AUTHOR        => 'Bruno Cornec <bruno#mondorescue.org>',
    18     EXE_FILES     => [ qw( sbin/mindi sbin/mranalyze-lvm sbin/mrprepare-lvm ) ],
     18    EXE_FILES     => [ qw( sbin/mindi sbin/mrprepare-lvm ) ],
    1919    MAN1PODS      => {
    2020            'sbin/mindi' => '$(INST_MAN1DIR)/mindi.$(MAN1EXT)',
  • devel/mindi/etc/mindi.conf

    r2149 r2540  
    4747mr_cache_dir mindi = /var/cache/mindi
    4848mr_cache_dir mondoarchive = /var/cache/mondo
    49 
    50 #
    51 # Temporary directory
    52 # Under it a temporary directory will be created to host all
    53 # temporary files for mindi. That subdirectory is erased at the end of mindi
    54 #
    55 mr_tmp_dir default = /tmp
    5649
    5750#
     
    131124e.g. Type 'nuke donteject textonly' if you have an unstable Newt library and \n\
    132125a PC whose CD-ROM drive tray would be damaged if it unexpectedly ejected.\n
    133 
    134 #
    135 # LVM commands and conf files
    136 # Is it LSB ?
    137 #
    138 mr_lvmdiskscan mindi = /usr/sbin/lvmdiskscan
    139 mr_lvmprocfile mindi = /proc/lvm/global
    140 mr_lvmcmd mindi = /usr/sbin/lvm
    141 mr_lvmpath mindi = /usr/sbin/
  • devel/mindi/post-install.sh

    r2538 r2540  
    3232MINDIREV=PBREV
    3333ARCH=`/bin/uname -m`
    34 echo "mindi ${MINDIVER}-r${MINDIREV} will be installed under $local"
     34echo "PBPKG ${MINDIVER}-r${MINDIREV} will be installed under $local"
    3535
    3636echo "Creating target directories ..."
    3737install -m 755 -d $conf $sublocallib $sublocalshare $CACHEDIR
    3838
    39 #echo "Copying files ..."
    40 #cp -af rootfs $sublocallib/mindi
    41 #chmod 755 $sublocallib/mindi/rootfs/sbin/*
    42 #install -m 644 msg-txt dev.tgz $sublocallib/mindi
     39echo "Copying files ..."
     40cp -a etc/PBPKG.conf $conf
     41#cp -af rootfs $sublocallib
     42#chmod 755 $sublocallib/rootfs/sbin/*
     43#install -m 644 msg-txt dev.tgz $sublocallib
    4344#install -m 644 deplist.txt udev.files proliant.files $conf
    4445
    4546# Substitute variables for mindi
    46 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
     47sed -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
    4748#sed -i -e "s~= "YYY"~= "$subconf"~" $local/bin/mindi-bkphw
    4849
    4950if [ "$PKGBUILDMINDI" != "true" ]; then
    50     chown -R root:root $sublocallib/mindi $conf
     51    chown -R root:root $sublocallib $conf
    5152fi
    5253
  • devel/mindi/sbin/mindi

    r2149 r2540  
    2525use ProjectBuilder::Distribution;
    2626use ProjectBuilder::Display;
    27 use MondoRescue::Mindi::LVM;
     27use MondoRescue::LVM;
    2828use MondoRescue::Base;
    2929
  • devel/mindi/sbin/mrprepare-lvm

    r2149 r2540  
    1919use ProjectBuilder::Distribution;
    2020use MondoRescue::Base;
    21 use MondoRescue::Mindi::LVM;
     21use MondoRescue::LVM;
    2222
    2323=pod
  • devel/mr/etc/mondorescue.conf

    r2149 r2540  
    99# mindi instable or cause failures. Use with care.
    1010
    11 #
    12 # Extra space for Ram disk
    13 #
    14 mr_extra_space mindi =  24576
    15 
    16 #
    17 # Size of the boot image
    18 #
    19 mr_boot_size mindi =  16384
    20 
    21 #
    22 # deplist file name (stored in $MINDI_CONF)
    23 #
    24 mr_deplist_file mindi = deplist.txt
    25 
    26 #
    27 # Write mindi CD (true|false) ?
    28 #
    29 mr_boot_cd mindi = true
    30 
    31 #
    32 # Write mindi USB (true|false) ?
    33 #
    34 mr_boot_usb mindi = false
    35 
    36 #
    37 # Write mindi Tape (true|false) ?
    38 #
    39 mr_boot_tape mindi = false
    40 
    41 #
    42 # Images creation dir
    43 # WARNING: This directory is erased before usage
    44 # This is also the directory mondoarchive will use to find
    45 # what it needs to create it rescue media
    46 #
    47 mr_cache_dir mindi = /var/cache/mindi
    48 mr_cache_dir mondoarchive = /var/cache/mondo
    49 
    50 #
    5111# Temporary directory
    5212# Under it a temporary directory will be created to host all
     
    5616
    5717#
    58 # USB Disk Device
    59 #
    60 mr_usb_device default = /dev/sda1
    61 
    62 #
    63 # Tape Device
    64 #
    65 mr_tape_device default = /dev/st0
    66 
    67 #
    68 # Additional Boot Parameters
    69 # You may want to remove acpi=off if you're unable to reboot on mindi's CD
    70 # You may want to add ramdisk_size=1024 if on Fedora Core 5/6
    71 #
    72 mr_boot_params mindi = acpi=off apm=off devfs=nomount exec-shield=0 noresume selinux=0 barrier mindi = off
    73 
    74 
    75 # Kernel to use (NATIVE|FAILSAFE|PATH TO THE KERNEL)
    76 #
    77 mr_kernel default = NATIVE
    78 #mr_kernel mindi = /boot/vmlinuz.special
    79 
    80 #
    81 # Modules supported by mindi and required at boot time
    82 #
    83 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
    84 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
    85 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
    86 mr_pcmcia_mods mindi = pcmcia_core ds yenta_socket
    87 mr_cdrom_mods mindi = cdrom isocd isofs inflate_fs nls_iso8859-1 nls_cp437 sg sr_mod zlib_inflate
    88 mr_tape_mods mindi = ht st osst ide-tape ide_tape
    89 mr_floppy_mods mindi = ide-floppy floppy
    90 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
    91 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
    92 
    93 # Additional modules to support
    94 # (white space separated list of modules)
    95 #
    96 mr_force_mods mindi =
    97 mr deny_mods mindi =
    98 
    99 #
    10018# Location of the fstab file
    10119#
    10220mr_fstab default = /etc/fstab
    103 
    104 #
    105 # Location of the logfile
    106 #
    107 mr_log_file mindi = /var/log/mindi.log
    108 mr_log_file mondoarchive = /var/log/mondoarchive.log
    109 mr_log_file mondorestore = /var/log/mondorestore.log
    110 
    111 #
    112 # Interactive mode (true|false)
    113 #
    114 mr_interactive mindi = true
    115 
    116 #
    117 # Boot message shown during media boot
    118 #
    119 mr_boot_msg mindi = \
    120 To format and restore all files automatically, type 'nuke' <enter>.\n\
    121 To restore some/all files interactively, type 'interactive' <enter>.\n\
    122 To compare the archives with your filesystem, type 'compare' <enter>.\n\
    123 To boot to a command-line prompt (expert mode), type 'expert' <enter>.\n\
    124 You may add one or more of the following parameters as well:-\n\n\
    125         donteject - mondorestore will not eject the CD; this is useful if, for\n\
    126                     instance, your PC's case has a concealed CD-ROM drive\n\
    127         noresize  - your mountlist will not be adjusted to use your unallocated\n\
    128                     hard disk space\n\
    129         textonly  - do not call any Newt library routines; this is unattractive\n\
    130                     but valuable if you find your Newt library has bugs in it\n\n\
    131 e.g. Type 'nuke donteject textonly' if you have an unstable Newt library and \n\
    132 a PC whose CD-ROM drive tray would be damaged if it unexpectedly ejected.\n
    13321
    13422#
     
    13624# Is it LSB ?
    13725#
    138 mr_lvmdiskscan mindi = /usr/sbin/lvmdiskscan
    139 mr_lvmprocfile mindi = /proc/lvm/global
    140 mr_lvmcmd mindi = /usr/sbin/lvm
    141 mr_lvmpath mindi = /usr/sbin/
     26mr_lvmdiskscan default = /usr/sbin/lvmdiskscan
     27mr_lvmprocfile default = /proc/lvm/global
     28mr_lvmcmd default = /usr/sbin/lvm   
     29mr_lvmpath default = /usr/sbin/
  • devel/mr/lib/MondoRescue/Base.pm

    r2539 r2540  
    1919use ProjectBuilder::Base;
    2020use ProjectBuilder::Conf;
     21use MondoRescue::DynConf;
    2122
    2223# Inherit from the "Exporter" module which handles exporting functions.
     
    5152=cut
    5253
    53 sub mr_exit {
     54sub mr_init {
    5455
    5556my $msg = shift || "";
     
    6061
    6162# Get the various location determined at installation time
    62 my ($confdir,$localdir,$pbproj) = mr_dyn_conf();
     63my ($confdir,$localdir,$pbproj) = mr_dynconf_init();
    6364
    6465# First use the main configuration file
    65 pb_conf_add("$confdir/$pbproj/$pbproj.conf");
     66pb_conf_init($pbproj);
     67pb_conf_add("$confdir/$pbproj.conf");
    6668}
    6769
  • devel/mr/lib/MondoRescue/LVM.pm

    r2538 r2540  
    88# Provided under the GPL v2
    99
    10 package MondoRescue::Mindi::LVM;
     10package MondoRescue::LVM;
    1111
    1212use strict 'vars';
     
    5353# Get params from the conf file
    5454my ($lvmds_t,$lvmproc_t,$lvmcmd_t,$lvmpath_t) = pb_conf_get("mr_lvmdiskscan","mr_lvmprocfile","mr_lvmcmd","mr_lvmpath");
    55 my $lvmds = $lvmds_t->{'mindi'};
    56 my $lvmproc = $lvmproc_t->{'mindi'};
    57 my $lvmcmd = $lvmcmd_t->{'mindi'};
    58 my $lvmpath = $lvmpath_t->{'mindi'};
     55my $lvmds = $lvmds_t->{$ENV{PBPROJ}};
     56my $lvmproc = $lvmproc_t->{$ENV{PBPROJ}};
     57my $lvmcmd = $lvmcmd_t->{$ENV{PBPROJ}};
     58my $lvmpath = $lvmpath_t->{$ENV{PBPROJ}};
    5959
    6060if (! -x $lvmproc) {
  • devel/mr/post-install.sh

    r2539 r2540  
    4444
    4545cp etc/PBPROJ.conf $conf
    46 cat > $PERLDIR/MondoRescue/DynConf.pm << EOF
     46cat > $HEAD$PERLDIR/MondoRescue/DynConf.pm << EOF
    4747#!/usr/bin/perl -w
    4848#
     
    6969sub mr_dynconf_init {
    7070
    71 return($subconf,$sublocal,"PBPROJ");
     71return("$subconf","$sublocal","PBPROJ");
    7272}
    73731;
  • devel/mr/sbin/mranalyze-lvm

    r2539 r2540  
    1919use ProjectBuilder::Distribution;
    2020use MondoRescue::Base;
    21 use MondoRescue::Mindi::LVM;
     21use MondoRescue::LVM;
    2222
    2323=pod
     
    133133pb_temp_init();
    134134
     135# MondoRescue init
     136mr_init();
     137
    135138# -------------------------------- main -----------------------------------
    136139# Where to send the output
  • devel/mr/sbin/mrcheck-lvm

    r2539 r2540  
    1919use ProjectBuilder::Distribution;
    2020use MondoRescue::Base;
    21 use MondoRescue::Mindi::LVM;
     21use MondoRescue::LVM;
    2222
    2323=pod
Note: See TracChangeset for help on using the changeset viewer.