Changeset 1060


Ignore:
Timestamp:
Jan 17, 2007, 6:03:13 AM (13 years ago)
Author:
bruno
Message:
  • mindi now uses completely the configuration file, including for modules description
  • DidMondoCallMe? gone for MONDO_SHARE usage rather
  • deplist.txt is now empty and replaced by a lot of files under deplist.d
  • install and package script adapted accordingly
  • delivered in hope others will test and report :-)
Location:
branches/stable
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/distributions/conf/deplist.d/lvm.conf

    r1047 r1060  
    33# Tools for LVM support
    44#
     5LVMFILES:
    56/etc/lvm/lvm.conf
    67/sbin/fsadm
  • branches/stable/mindi/distributions/conf/mindi.conf.dist

    r1047 r1060  
    1818
    1919#
    20 # deplist directory
     20# Maximum compressed size for disk image in KB.
    2121#
    22 mindi_deplist_dir="/etc/mindi/deplist.d"
     22mindi_max_compressed_size=1300
     23
     24#
     25# deplist file name (stored in $MINDI_CONF)
     26#
     27mindi_deplist_file="deplist.txt"
    2328
    2429#
     
    3843
    3944#
     45# If set to "no", you will be prompted for whether or not
     46# you want to use your own kernel, or the supplied default.
     47# If "yes" mindi will automatically use your own kernel.
     48#
     49mindi_use_own_kernel="yes"
     50
     51#
    4052# Images creation dir
     53# WARNING: This directory is erased before usage
    4154#
    4255mindi_images_dir="/var/cache/mindi"
     
    5467#
    5568# 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
    5671#
    5772mindi_boot_params="acpi=off apm=off devfs=nomount exec-shield=0 noresume selinux=0 barrier=off"
    5873
    59 # TBC
    6074
    6175# Kernel to use (NATIVE|FAILSAFE|PATH TO THE KERNEL)
     
    6478#mindi_kernel="/boot/vmlinuz.special"
    6579
    66 # TBC
     80#
     81# Modules supported by mindi and required at boot time
     82#
     83mindi_scsi_mods="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 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"
     84mindi_ide_mods="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"
     85mindi_usb_mods="usb-storage usb-ohci usb-uhci usbcore usb_storage hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd usbkbd usbhid"
     86mindi_pcmcia_mods="pcmcia_core ds yenta_socket"
     87mindi_cdrom_mods="cdrom isocd isofs inflate_fs nls_iso8859-1 nls_cp437 sg sr_mod zlib_inflate"
     88mindi_tape_mods="ht st osst ide-tape ide_tape"
     89mindi_floppy_mods="ide-floppy floppy"
     90mindi_net_mods="sunrpc nfs nfs_acl lockd loop mii 3c59x e100 bcm5700 bnx2 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 vmxnet vmnet"
     91mindi_extra_mods="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"
    6792
    68 #
    69 # Additinal modules to support
     93# Additional modules to support
    7094# (white space separated list of modules)
    7195#
    72 mindi_additional_modules=""
    73 
    74 # TBC
    75 
    76 #
    77 # Boot loader to use
    78 # (GRUB|ELILO|LILO|RAW|NATIVE)
    79 #
    80 mindi_boot_loader="NATIVE"
     96mindi_additional_mods=""
    8197
    8298#
  • branches/stable/mindi/distributions/freebsd/pkg-plist

    r1039 r1060  
    11etc/mindi/deplist.txt
     2etc/mindi/mindi.conf
     3etc/mindi/mindi.conf.dist
     4etc/mindi/mindi.conf.dist.md5
    25doc/ChangeLog
    36doc/INSTALL
     
    1316@dirrm lib/mindi
    1417@dirrm etc/mindi
     18@dirrm etc/mindi/mindi.d
  • branches/stable/mindi/distributions/rpm/mindi.spec

    r1047 r1060  
    6060%config(noreplace) %{_sysconfdir}/mindi/mindi.conf
    6161%config(noreplace) %{_sysconfdir}/mindi/mindi.conf.dist
     62%config(noreplace) %{_sysconfdir}/mindi/mindi.conf.dist.md5
    6263%doc ChangeLog INSTALL COPYING README TODO README.ia64 README.pxe README.busybox svn.log
    6364%{_mandir}/man8/*
  • branches/stable/mindi/install.sh

    r1047 r1060  
    7272echo "Copying files ..."
    7373install -m 644 isolinux.cfg msg-txt sys-disk.raw.gz isolinux-H.cfg syslinux.cfg syslinux-H.cfg dev.tgz $locallib/mindi
    74 install -m 644 deplist.txt $conf
    7574install -m 644 distributions/conf/deplist.d/* $conf/deplist.d
    7675install -m 444 distributions/conf/mindi.conf.dist $conf
     76md5sum $conf/mindi.conf.dist > $conf/mindi.conf.dist.md5
    7777cat > $conf/mindi.conf << EOF
    7878#
     
    8888EOF
    8989chmod 644 $conf/mindi.conf
     90
     91cat > $conf/deplist.txt << EOF
     92# mindi additional dependency list
     93#
     94# NB:
     95# You have to give an absolute path
     96# If you want to add something, just add it on its own line. K.I.S.S.
     97
     98EOF
     99chmod 644 $conf/deplist.txt
    90100
    91101cp -af rootfs aux-tools $locallib/mindi
  • branches/stable/mindi/mindi

    r1059 r1060  
    3636
    3737MINDI_CONFIG_DIST="$MINDI_CONF/mindi.conf.dist"
    38 if [ ! -f $MINDI_CONFIG_CONF ]; then
    39     echo "Unable to find $MINDI_CONFIG_CONF. Please reinstall mindi"
     38if [ ! -f $MINDI_CONFIG_DIST ]; then
     39    echo "Unable to find $MINDI_CONFIG_DIST. Please reinstall mindi"
    4040    MindiExit -1
    4141fi
     42md5sum --status -c "$MINDI_CONF/mindi.conf.dist.md5"
     43if [ $? -ne 0 ]; then
     44    echo "$MINDI_CONF/mindi.conf.dist md5 checksum incorrect. Please reinstall mindi"
     45MindiExit -1
     46fi
    4247. $MINDI_CONFIG_DIST
    4348
    4449MINDI_CONFIG="$MINDI_CONF/mindi.conf"
    4550if [ ! -f $MINDI_CONFIG ]; then
    46     echo "No $MINDI_CONFIG file found using sensible values"
     51    echo "No $MINDI_CONFIG file found using sensible values from $MINDI_CONFIG_DIST"
    4752else
    48     echo "Using $MINDI_CONFIG as additional config file"
     53    echo "Using $MINDI_CONFIG as additional config file to $MINDI_CONFIG_DIST"
    4954    . $MINDI_CONFIG
    5055fi 
     
    5560EXTRA_SPACE=$mindi_extra_space
    5661IA64_BOOT_SIZE=$mindi_ia64_boot_size
    57 DEPLIST_DIR="$mindi_deplist_dir"
    58 # TBC
     62DEPLIST_DIR="$MINDI_CONF/deplist.d"
     63DEPLIST_FILE="$MINDI_CONF/$mindi_deplist_file"
    5964WRITE_BOOT_FLOPPIES="$mindi_write_boot_floppy"
    60 # TBC
    61 WRITE_MINDI_CD="$mindi_write_cd"
    62 # TBC
     65PROMPT_MAKE_CD_IMAGE="$mindi_write_cd"
     66USE_OWN_KERNEL="$mindi_use_own_kernel"
    6367CACHE_LOC="$mindi_images_dir"
    6468FORCE_DUAL_FLOPPIES="$mindi_dual_floppies"
     
    8488    # If "yes" mindi will automatically use your own kernel.
    8589    USE_OWN_KERNEL="no"
    86 else
    87     PROMPT_WRITE_BOOT_FLOPPIES="no"
    88     PROMPT_MAKE_CD_IMAGE="no"
    89     USE_OWN_KERNEL="yes"
    9090fi
    9191
    92 FLOPPY_MODS="ide-floppy floppy"
    93 TAPE_MODS="ht st osst ide-tape ide_tape"
    94 SCSI_MODS="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 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"
    95 IDE_MODS="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"
    96 PCMCIA_MODS="pcmcia_core ds yenta_socket"
    97 USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd usbkbd usbhid"
    98 CDROM_MODS="$TAPE_MODS $FLOPPY_MODS $IDE_MODS af_packet cdrom isocd isofs inflate_fs nls_iso8859-1 nls_cp437 sg sr_mod zlib_inflate $USB_MODS $PCMCIA_MODS"
    99 NET_MODS="sunrpc nfs nfs_acl lockd loop mii 3c59x e100 bcm5700 bnx2 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 vmxnet vmnet"
    100 EXTRA_MODS="$CDROM_MODS 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"
     92FLOPPY_MODS="$mindi_floppy_mods"
     93TAPE_MODS="$mindi_tape_mods"
     94SCSI_MODS="$mindi_scsi_mods"
     95IDE_MODS="$mindi_ide_mods"
     96PCMCIA_MODS="$mindi_pcmcia_mods"
     97USB_MODS="$mindi_usb_mods"
     98CDROM_MODS="$TAPE_MODS $FLOPPY_MODS $IDE_MODS $mindi_cdrom_mods $USB_MODS $PCMCIA_MODS"
     99NET_MODS="$mindi_net_mods"
     100EXTRA_MODS="$CDROM_MODS $mindi_extra_mods $mindi_additional_mods"
    101101
    102102BOOT_MEDIA_MESSAGE="$mindi_boot_msg"
    103103FDISK=$MINDI_SBIN/parted2fdisk
    104 
    105 # Using a config file allow to overwrite some values
    106 MINDI_CONFIG="$MINDI_CONF/mindi.conf"
    107 if [ -f $MINDI_CONFIG ]; then
    108     . $MINDI_CONFIG
    109 fi
    110104
    111105# Now we can create what we nedd
     
    251245    biggienumber=$4
    252246
    253     [ -d "$filename" ] && Die "Cannot chop up $filename: it's a directory. Please amend deplist.txt accordingly."
     247    [ -d "$filename" ] && Die "Cannot chop up $filename: it's a directory. Please amend $DEPLIST_FILE accordingly."
    254248    mkdir -p $outdir
    255249
     
    415409    if [ "$?" -ne "0" ] ; then
    416410        umount $mountpoint
    417         Die "Tarball $tarball is too big for disk! (CODI)\nTell Dev Team to adjust MAX_COMPRESSED_SIZE"
     411        Die "Tarball $tarball is too big for disk! (CODI)\nAdjust mindi_max_compressed_size in your $MINDI_CONFIG"
    418412    fi
    419413    [ "$diskno" -eq "$noof_disks" ] && echo "This is the last disk ($diskno=$noof_disks)" >> $mountpoint/LAST-DISK
    420414    umount $mountpoint || LogIt "Cannot umount (CODI)"
    421415    rmdir $mountpoint || LogIt "Cannot rmdir (CODI)"
    422 }
    423 
    424 
    425 DidMondoCallMe() {
    426     local res
    427 
    428     res=0
    429     [ "`ps ax | grep -F "mondoarchive" | grep -v "grep"`" ] && res=$(($res+1))
    430     [ -f "/var/run/monitas-mondo.pid" ] && res=$(($res+1))
    431     [ "$res" -gt "1" ] && echo "yes"
    432416}
    433417
     
    462446
    463447    # Creates a tar file containing all required files
    464     for i in /etc/fstab /etc/lilo.conf /etc/raidtab $LOGFILE /var/log/mondo-archive.log ; do
     448    for i in $MY_FSTAB /etc/lilo.conf /etc/raidtab $LOGFILE /var/log/mondo-archive.log ; do
    465449        [ -e "$i" ] && cp -f $i $MINDI_TMP 2>> $LOGFILE
    466450    done
     
    772756        [ "$modres" -eq "3" ] && echo -en "\t|"
    773757    done
    774     if [ "`DidMondoCallMe`" ] ; then
     758    if [ "$MONDO_SHARE" ] ; then
    775759        mkdir -p $bigdir/tmp
    776760        mkdir -p $bigdir/sbin
     
    12501234                current_partition=$actual_dev
    12511235            else
    1252                 Die "Your system uses a LABEL partition ($current_partition), but you lack the tool to support it.\nPlease replace labels with their correct devices in /etc/fstab or install findfs|blkid|vol_id"
     1236                Die "Your system uses a LABEL partition ($current_partition), but you lack the tool to support it.\nPlease replace labels with their correct devices in $MY_FSTAB or install findfs|blkid|vol_id"
    12531237            fi
    12541238        # This part tries to retrieve the correct device from a UUID line in /etc/fstab
     
    12981282                current_partition=$actual_dev
    12991283            else
    1300                 Die "Your system uses a UUID partition ($current_partition), but you lack the tool to support it.\nPlease replace labels with their correct devices in /etc/fstab or install findfs|blkid|vol_id"
     1284                Die "Your system uses a UUID partition ($current_partition), but you lack the tool to support it.\nPlease replace labels with their correct devices in $MY_FSTAB or install findfs|blkid|vol_id"
    13011285            fi
    13021286        else
     
    15281512OfferToMakeBootableISO() {
    15291513    local i old_pwd
    1530     if [ "$PROMPT_MAKE_CD_IMAGE" = "yes" ] && [ ! "`DidMondoCallMe`" ] ; then
     1514    if [ "$PROMPT_MAKE_CD_IMAGE" = "yes" ] && [ ! "$MONDO_SHARE" ] ; then
    15311515        echo -en "Shall I make a bootable CD image? (y/[n]) "
    15321516        read i
     
    15501534            cp -f $j $k 2> /dev/null || Die "Failed to copy $j to $k"
    15511535            cp -f $j $MINDI_TMP 2> /dev/null || Die "Failed to copy $j to $MINDI_TMP"
    1552             cp -f $j $MONDO_ROOT 2>> $LOGFILE || Die "Failed to copy $j to $MONDO_ROOT"
     1536            [ "$MONDO_SHARE" ] && cp -f $j $MONDO_ROOT 2>> $LOGFILE || Die "Failed to copy $j to $MONDO_ROOT"
    15531537        fi
    15541538    done
    15551539    MakeSyslinuxMessageFile $MINDI_TMP/iso/isolinux/message.txt
    15561540    cp $kernelpath $MINDI_TMP/iso/isolinux/vmlinuz 2> /dev/null || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MINDI_TMP/iso/isolinux/vmlinuz). Did you run out of disk space?"
    1557     cp $kernelpath $MONDO_ROOT/vmlinuz 2> /dev/null || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"
     1541    [ "$MONDO_SHARE" ] && cp $kernelpath $MONDO_ROOT/vmlinuz 2> /dev/null || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"
    15581542    cp $MINDI_TMP/mindi.rdz $MINDI_TMP/iso/isolinux/initrd.img 2>> $LOGFILE
    1559     cp $MINDI_TMP/mindi.rdz $MONDO_ROOT/initrd.img 2>> $LOGFILE
     1543    [ "$MONDO_SHARE" ] && cp $MINDI_TMP/mindi.rdz $MONDO_ROOT/initrd.img 2>> $LOGFILE
    15601544    [ -e "$iso_cfg_file" ] || Die "FIXME - unable to find $iso_cfg_file - this should never occur"
    15611545    cd $MINDI_TMP/iso/isolinux
     
    15711555    cd $MINDI_TMP/iso
    15721556    if [ "$ARCH" != "ia64" ] ; then
    1573         cp -f $MINDI_TMP/iso/isolinux/{isolinux.cfg,initrd.img,vmlinuz,isolinux.bin,message.txt} $MONDO_ROOT 2> /dev/null || Die "Cannot copy core files to ramdisk for boot disk. Did you run out of disk space?"
     1557        [ "$MONDO_SHARE" ] && cp -f $MINDI_TMP/iso/isolinux/{isolinux.cfg,initrd.img,vmlinuz,isolinux.bin,message.txt} $MONDO_ROOT 2> /dev/null || Die "Cannot copy core files to ramdisk for boot disk. Did you run out of disk space?"
    15741558    fi
    15751559    [ "$MONDO_SHARE" ] && cp -f $MONDO_SHARE/autorun .    2>> $LOGFILE
     
    16071591    fi
    16081592    if [ "$disksize" -gt "2880" ] ; then
    1609         if [ "`DidMondoCallMe`" ] ; then
     1593        if [ "$MONDO_SHARE" ] ; then
    16101594            if [ "$CDRECOVERY" != "yes" ] ; then
    16111595                if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
     
    17021686    if [ "$CDRECOVERY" = "yes" ] ; then
    17031687        echo -en "default=RESTORE\n"
    1704     elif [ "$disksize" -gt "2880" ] && [ "`DidMondoCallMe`" ] ; then
     1688    elif [ "$disksize" -gt "2880" ] && [ "$MONDO_SHARE" ] ; then
    17051689        if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
    17061690            echo -en "default=iso\n"
     
    17231707        options="RESTORE expert"
    17241708    elif [ "$disksize" -gt "2880" ] ; then
    1725         if [ "`DidMondoCallMe`" ] ; then
     1709        if [ "$MONDO_SHARE" ] ; then
    17261710            if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
    17271711                options="iso"
     
    20212005
    20222006PrepareDataDiskImages() {
    2023     local needlist bigdir minidir_root tardir diskdir imagesdir res i j k old_pwd lines
     2007    local needlist bigdir minidir_root tardir diskdir imagesdir res i j k old_pwd lines lfiles
    20242008
    20252009    imagesdir=$1
     
    20322016    tardir=$MINDI_TMP/tardir
    20332017
    2034     lines=`grep -vx " *#.*" $MINDI_CONF/deplist.txt | grep -vx "" | wc -l`
    2035     cat $MINDI_CONF/deplist.txt | GenerateGiantDependencyList $needlist $lines
     2018    if [ -e "$DEPLIST_FILE" ]; then
     2019        lfiles="$DEPLIST_FILE $DEPLIST_DIR/*"
     2020    else
     2021        lfiles="$DEPLIST_DIR/*"
     2022    fi
     2023    lines=`grep -vx " *#.*" $lfiles | grep -vx "" | wc -l`
     2024    cat $lfiles | GenerateGiantDependencyList $needlist $lines
    20362025    res=$?
    20372026    if [ "$YOUR_KERNEL_SUCKS" ]; then
     
    20692058    FindAndAddUserKeyboardMappingFile
    20702059    mkdir -p $bigdir/tmp
    2071     if [ "`DidMondoCallMe`" ] ; then
     2060    if [ "$MONDO_SHARE" ] ; then
    20722061        MakeMondoConfigFile $MINDI_TMP/mondo-restore.cfg
    20732062        cp -f $MINDI_TMP/mondo-restore.cfg $bigdir/tmp &> /dev/null
     
    21092098    if [ -e "$MONDO_SHARE/restore-scripts" ] ; then
    21102099        cp -Rdf $MONDO_SHARE/restore-scripts/* . 2>> $LOGFILE
    2111         [ "$?" -ne "0" ] && [ "`DidMondoCallMe`" ] && Die "Cannot find/install $MONDO_SHARE/restore-scripts"
     2100        [ "$?" -ne "0" ] && Die "Cannot find/install $MONDO_SHARE/restore-scripts"
    21122101    fi
    21132102    [ -d "/lib/dev-state" ] && cp --parents -pRdf /lib/dev-state . 2>> $LOGFILE
     
    21182107    noof_disks=$?
    21192108    [ "$noof_disks" -eq "0" ] && Die "Too much stuff!"
    2120 #    if [ "$noof_disks" -ge "8" ] ; then
    2121 #        LogIt "You are putting a ludicrously large amount of data on these disks."
    2122 #        LogIt "I shall therefore double EXTRA_SPACE, just in case your ramdisk is too small."
    2123 #        EXTRA_SPACE=$(($EXTRA_SPACE*2))
    2124 #    fi
    21252109    MakeMountlist $MINDI_TMP/mountlist.txt
    21262110    mkdir -p $minidir_root/$noof_disks/tmp
    21272111    cp -f $MINDI_TMP/mountlist.txt $minidir_root/$noof_disks/tmp/mountlist.txt 2> /dev/null || Die "Cannot copy mountlist.txt from $MINDI_TMP to data disk"
    2128     [ "`DidMondoCallMe`" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MINDI_TMP/. 2>> $LOGFILE
     2112    [ "$MONDO_SHARE" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MINDI_TMP/. 2>> $LOGFILE
    21292113    [ $LVM != "false" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm || LVM="false"
    21302114    cat $minidir_root/$noof_disks/tmp/mountlist.txt >> $LOGFILE
     
    25882572    dd if=/dev/zero of=$mountpoint/zero &> /dev/null
    25892573    rm -f $mountpoint/zero
    2590     if [ "`DidMondoCallMe`" ] ; then
     2574    if [ "$MONDO_SHARE" ] ; then
    25912575        MakeMondoConfigFile $mountpoint/tmp/mondo-restore.cfg
    25922576        cp -f $mountpoint/tmp/mondo-restore.cfg $MINDI_TMP &> /dev/null
     
    26462630    cd $minidir_root/all
    26472631    size_of_all_tools=`du -sk . | cut -f1`
    2648     if [ "`DidMondoCallMe`" ] ; then
     2632    if [ "$MONDO_SHARE" ] ; then
    26492633        for q in filelist.full.gz biggielist.txt ; do
    26502634            [ ! -e "$MINDI_TMP/$q" ] && Die "Cannot find $MINDI_TMP/$q"
     
    27562740    FindLiloBinary
    27572741fi
    2758 # BERLIOS: Remove as too dangerous and now useless
    2759 #grep -F " $MINDI_TMP " /proc/mounts | grep -F tmpfs > /dev/null 2> /dev/null && MINDI_TMP=/home/tmpmondo && mkdir -p $MINDI_TMP && LogIt "Changing MINDI_TMP to $MINDI_TMP because you're using tmpfs for /tmp\n" ; # tmpfs doesn't like Mindi and /tmp, for some reason
    27602742trap "Aborted" SIGTERM
    27612743DONE="\r\t\t\t\t\t\t\t\tDone.         "
    27622744CHOPSIZE=240
    27632745BIGNO=0
    2764 MAX_COMPRESSED_SIZE=1300
    2765 kernelpath=""
    2766 MONDO_ROOT=/var/cache/mondo
    2767 mkdir -p $MONDO_ROOT
     2746MAX_COMPRESSED_SIZE="$mindi_max_compressed_size"
     2747kernelpath="$mindi_kernel"
     2748if [ "$kernelpath" = "NATIVE" ]; then
     2749    kernelpath=""
     2750fi
     2751USE_LILO=no
    27682752
    27692753if [ -d "/proc/lvm" ]; then
     
    27882772lsmod >> $LOGFILE
    27892773echo "-------------" >> $LOGFILE
    2790 
    2791 if [ "$#" -ge "2" ] ; then
    2792     if [ "$1" = "--max-compressed-size" ] ; then
    2793         MAX_COMPRESSED_SIZE=$2
    2794         shift; shift
    2795     fi
    2796 fi
     2774echo "Liste of extra modules is:" >> $LOGFILE
     2775echo "$EXTRA_MODS" >> $LOGFILE
     2776echo "-------------" >> $LOGFILE
     2777
    27972778
    27982779FLOPPY_WAS_MOUNTED=""
     
    28212802        MindiExit 0
    28222803    elif [ "$#" -ge "9" ] && [ "$1" = "--custom" ] ; then
     2804        [ ! "$MONDO_SHARE" ] && Die "--custom is reserved for mondoarchive calls"
    28232805        MONDO_TMP=$2
    28242806        # Change MINDI_TMP for the one provided by mondo
     
    29142896
    29152897[ -e "$iso_cfg_file" ] || Die "Cannot find $iso_cfg_file"
    2916 if [ ! "`DidMondoCallMe`" ] ; then
     2898if [ ! "$MONDO_SHARE" ] ; then
    29172899    LogIt "Mindi Linux mini-distro generator v$MINDI_VERSION"
    29182900    LogIt "Latest Mindi is available from http://www.mondorescue.org"
     
    29542936
    29552937if [ "$kernelpath" = "" ] ; then
    2956     [ "`DidMondoCallMe`" ] && Die "Please use -k <path> to specify kernel."
     2938    [ "$MONDO_SHARE" ] && Die "Please use -k <path> to specify kernel."
    29572939    echo -en "Do you want to use your own kernel to build the boot disk ([y]/n) ?"
    29582940    read ch
     
    29712953    fi
    29722954fi
    2973 if [ ! "`DidMondoCallMe`" ] ; then
     2955if [ ! "$MONDO_SHARE" ] && [ $INTERACTIVE = "yes" ]; then
    29742956    echo -en "Would you like to use LILO (instead of syslinux)\nfor your boot CD/floppies (y/[n]) ?"
    29752957    read ch
    2976     if [ "$ch" != "y" ] && [ "$ch" != "Y" ] ; then
    2977         USE_LILO=no
    2978     else
     2958    if [ "$ch" = "y" ] || [ "$ch" = "Y" ] ; then
    29792959        USE_LILO=yes
    29802960    fi
     
    30343014...Or type 'memtest' to test your PC's RAM thoroughly.\n"
    30353015
    3036 if [ ! "`DidMondoCallMe`" ] ; then
     3016if [ ! "$MONDO_SHARE" ] ; then
    30373017    ListImagesForUser $CACHE_LOC
    30383018    boot_dev=/dev/fd0u1722
  • branches/stable/mondo-doc/mindi.8

    r978 r1060  
    3333.BI "mindi --makemountlist "file
    3434.br
    35 .BI "mindi [--max-compressed-size "max "] --custom " parameters
     35.BI "mindi --printvar "variable
    3636.SH DESCRIPTION
    3737.PP
     
    6464.SH OPTIONS
    6565.TP
    66 .BR "-v"| " --version"| " -V"| " -version"
    67 Prints the version of mindi.
    68 .TP
    69 .B --findkernel
    70 Finds the image of the running kernel in the file system.
     66.BI "-v"| " --version"| " -V"| " -version"
     67.RI Prints the version of mindi.
     68.TP
     69.BI "--findkernel"
     70.RI Finds the image of the running kernel in the file system.
    7171.TP
    7272.BI "--makemountlist "file
    7373.RI "Creates a mount list and writes it to file "file ".
    7474.TP
    75 .BI "--max-compressed-size "max
    76 Maximum size for disk image in KB.
     75.BI "--printvar "variable
     76.RI "prints the value of the variable (useful for mondo-archive and debug)"
    7777.TP
    7878.BI "--custom " parameters
    79 Provide all required parameters to
    80 .B mindi
    81 for non-interactive calling. This usually means a call from
     79.RI "Provide all required parameters to"
     80.B mindi
     81.RI "for non-interactive calling. This usually means a call from"
    8282.BR "mondoarchive(8)".
    8383The following parameters are used:
     
    120120.br
    12112119) make non-bootable [yes|no]
     122.br
     12320) use gzip [yes|no]
    122124.br
    123125(Blank parameters must be specified as "" on the command line.)
     
    135137reports.
    136138.TP
     139.I /etc/mindi/deplist.d
     140Files containing the list of files to be included on boot/root disks.
     141.TP
    137142.I /etc/mindi/deplist.txt
    138 List of files to be included on boot/root disks.
     143List of additional files to be included on boot/root disks.
    139144.TP
    140145.I /var/cache/mindi/N.tar.gz
     
    168173called
    169174.B mindi.conf
    170 which overwrites default values by setting up the following variables:
    171 .TP
    172 .I TMPDIR
    173 .B (default /tmp): directory to create temporary files
    174 .br
    175 .TP
    176 .I EXTRA_SPACE
    177 .B (default 24576): increase if you run out of ramdisk space
    178 .br
    179 .TP
    180 .I IA64_BOOT_SIZE
    181 .B (default 8192): size of the ia64 boot disk
    182 .br
    183 .TP
    184 .I CACHE_LOC
    185 .B (default /var/cache/mindi): directory where boot/root files
    186 and iso are generated
    187 .br
    188 WARNING: This directory is erased before usage
     175which overwrites default values described in
     176.B mindi.conf.dist
     177in the same directory.
    189178.br
    190179.SH "SEE ALSO"
Note: See TracChangeset for help on using the changeset viewer.