Changeset 1885 in MondoRescue

Timestamp:

Mar 2, 2008, 12:38:35 AM (17 years ago)

Author:

Bruno Cornec

Message:

• Remove floppy support from mindi and mondo and adapt docs
• Align more mindi with the version from stable

Location:

branches/2.2.5

Files:

• mindi/mindi (modified) (51 diffs)
• mindi/rootfs/README (modified) (1 diff)
• mindi/rootfs/sbin/bug-me (deleted)
• mindi/rootfs/sbin/find-and-mount-cdrom (modified) (1 diff)
• mindi/rootfs/sbin/init (modified) (7 diffs)
• mindi/rootfs/sbin/untar (modified) (2 diffs)
• mondo-doc/mindi.8 (modified) (3 diffs)
• mondo-doc/mondoarchive.8 (modified) (4 diffs)
• mondo-doc/mondorescue-howto.sgml (modified) (30 diffs)
• mondo/distributions/conf/mondorescue.conf (modified) (1 diff)
• mondo/src/common/libmondo-archive-EXT.h (modified) (1 diff)
• mondo/src/common/libmondo-archive.c (modified) (5 diffs)
• mondo/src/common/libmondo-archive.h (modified) (2 diffs)
• mondo/src/common/libmondo-devices.c (modified) (1 diff)
• mondo/src/common/my-stuff.h (modified) (1 diff)
• mondo/src/mondoarchive/main.c (modified) (1 diff)
• mondo/src/mondoarchive/mondo-cli.c (modified) (1 diff)
• mondo/src/mondorestore/mondo-restore.c (modified) (4 diffs)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (3 diffs)
• pbconf/mondo-doc/du/mondo-doc.doc-base (modified) (1 diff)

branches/2.2.5/mindi/mindi

@@ -43 +43 @@
 BOOT_SIZE=16384         # size of the boot disk
 MAX_DISKS=99
-WRITE_BOOT_FLOPPIES="yes"   # do you want to be propted to write floppy images
-PROMPT_WRITE_BOOT_FLOPPIES="yes"
-    # do you want to be prompted to write
-    # floppy images out to floppy disks?
-    # if 'no', images will not be written to floppies
 
 PROMPT_MAKE_CD_IMAGE="yes"
@@ -63 +58 @@
 
 MY_FSTAB=/etc/fstab
-FLOPPY_MODS="ide-floppy floppy"
 TAPE_MODS="ht st osst ide-tape ide_tape"
 SCSI_MODS="3w-xxxx 3w_xxxx 3w_9xxx 3w-9xxx 53c7,8xx a100u2w a320raid aacraid adpahci 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 megaraid_mm megaraid_mbox megaraid_sas 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 scsi_transport_sas scsi_transport_spi sd_mod seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs"
 
 # ide-probe-mod
-IDE_MODS="ide ide-generic ide-detect ide-mod ide-disk ide-cd ide_cd ide-cs ide-core ide_core edd paride ata_generic ata_piix libata via82cxxx generic nvidia ahci sata_nv cmd64x pata_amd pata_marvell pata_serverworks"
+IDE_MODS="ide ide-floppy floppy ide-generic ide-detect ide-mod ide-disk ide-cd ide_cd ide-cs ide-core ide_core edd paride ata_generic ata_piix libata via82cxxx generic nvidia ahci sata_nv cmd64x pata_amd pata_marvell pata_serverworks"
 PCMCIA_MODS="pcmcia_core ds yenta_socket"
 USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage input hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd ohci-hcd ohci_hcd usbkbd usbhid keybdev mousedev libusual"
-CDROM_MODS="$TAPE_MODS $FLOPPY_MODS $IDE_MODS af_packet cdrom isocd isofs inflate_fs nls_iso8859-1 nls_cp437 nls_utf8 sg sr_mod zlib_inflate $USB_MODS $PCMCIA_MODS"
+CDROM_MODS="$TAPE_MODS $IDE_MODS af_packet cdrom isocd isofs inflate_fs nls_iso8859-1 nls_cp437 nls_utf8 sg sr_mod zlib_inflate $USB_MODS $PCMCIA_MODS"
 NET_MODS="sunrpc nfs nfs_acl lockd fscache loop mii 3c59x e100 bcm5700 bnx2 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 forcedeth vmxnet vmnet"
 EXTRA_MODS="$CDROM_MODS vfat fat loop md-mod linear raid0 raid1 xor raid5 raid456 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"
@@ -81 +75 @@
 
 LOGFILE=/var/log/mindi.log
-FDDEVICE=/dev/fd0             ; # 1.44MB floppy #0
 MINDI_CACHE=/var/cache/mindi
-FORCE_DUAL_FLOPPIES=no
 BOOT_MEDIA_MESSAGE="\
 To format and restore all files automatically, type 'nuke' <enter>.\n\
@@ -106 +98 @@
     . $MINDI_CONFIG
 fi
+DEPLIST_FILE="$MINDI_CONF/deplist.txt"
+ISO_CMD="/usr/bin/mkisofs"
+ISO_OPT="-J -r -v -p Mindi -publisher http://www.mondorescue.org -A Mindi"
 
 # Now we can create what we need
 export MINDI_TMP=`mktemp -d $TMPDIR/mindi.XXXXXXXXXX`
-mkdir -p $MINDI_TMP
-
-# Purge from potential old run
-rm -rf $MINDI_CACHE/* 2> /dev/null
-mkdir -p $MINDI_CACHE
+
 # ----------------------------------------------------------------------------
 
@@ -249 +240 @@
     biggienumber=$4
 
-    [ -d "$filename" ] && Die "Cannot chop up $filename: it's a directory. Please amend deplist.txt accordingly."
+    [ -d "$filename" ] && Die "Cannot chop up $filename: it's a directory. Please amend $DEPLIST_FILE accordingly."
     mkdir -p $outdir
 
@@ -361 +352 @@
         Die "Please install either fdformat or superformat."
     fi
-    echo -en "\rWriting $comment"
+    echo -en "\nWriting $comment"
     if echo $image | grep "mindi-[r|b]oot\.1440" &> /dev/null ; then
         cat $image > $dev &
@@ -1039 +1030 @@
                 if echo "$MODULES" | grep lvm &> /dev/null ; then
                     echo "I think you are, so please take heed!" >> $LOGFILE
-#                   LogIt "Where is liblvm? You need it."
                 else
                     echo "I don't think you are, so don't worry about it." >> $LOGFILE
@@ -1257 +1247 @@
     [ "$mountlist" != "" ] && rm -Rf $mountlist
     > $mountlist
-    echo -en "\rHang on...\r"
     all_partitions=""
     
     if [ $LVM != "false" ]; then
-        echo -en "\rAnalyzing LVM...\r"
+        echo -en "Analyzing LVM...\n"
         $MINDI_LIB/analyze-my-lvm > $MINDI_TMP/lvm.res
         if [ $? -ne 0 ]; then
@@ -1367 +1356 @@
                 current_partition=$actual_dev
             else
-                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"
+                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"
             fi
         # This part tries to retrieve the correct device from a UUID line in /etc/fstab
@@ -1643 +1632 @@
 
 
-
-OfferToCopyImagesToDisks() {
-    local imagesdir i imagename dev count boot_dev data_dev
-    imagesdir=$1
-    boot_dev=$2
-    data_dev=$3
-
-    echo -en "Would you like to create boot+data floppy disks now (y/[n]) ?"
-    read i
-    [ "$i" != "y" ] && [ "$i" != "Y" ] && return
-    mount | grep -F /dev/fd > /dev/null && Die "Please unmount your floppies first."
-    echo "WARNING! THIS WILL ERASE YOUR FLOPPY DISKS."
-    [ ! -e "$boot_dev" ] && Die "Cannot find $boot_dev - is your Linux distro broken?"
-    [ ! -e "$data_dev" ] && Die "Cannot find $data_dev - is your Linux distro broken?"
-    i=`find $imagesdir -type f | grep -F "/mindi-root.1" 2> /dev/null`
-    j=`find $imagesdir -type f | grep -F "/mindi-boot" | grep -Ev "2880|$BOOT_SIZE"`
-    if [ "$i" ] ; then
-        CopyImageToDisk $j $data_dev "boot disk"
-        CopyImageToDisk $i $data_dev "root disk"
-    else
-        CopyImageToDisk $j $boot_dev "boot/root disk"
-    fi
-    count=1
-    for i in `find $imagesdir | grep -F mindi-data` ; do
-        CopyImageToDisk $i $data_dev "data disk #$count"
-        count=$(($count+1))
-    done
-}
-
-
 OfferToMakeBootableISO() {
     local i old_pwd
@@ -1680 +1639 @@
         [ "$i" != "y" ] && [ "$i" != "Y" ] && return 0
     fi
-    if [ ! "$MINDI_TMP" ] ; then
-        LogIt "NB: Mindi's bootable CD always uses isolinux."
-        LogIt "For a bootable CD w/LILO, please use Mondo."
+    if [ _"$MINDI_TMP" = _"" ]; then
+        Die "MINDI_TMP undefined"
     fi
     rm -Rf $MINDI_TMP/iso
@@ -1697 +1655 @@
             cp -f $j $k 2> /dev/null || Die "Failed to copy $j to $k"
             cp -f $j $MINDI_TMP 2> /dev/null || Die "Failed to copy $j to $MINDI_TMP"
-            cp -f $j $MONDO_ROOT 2>> $LOGFILE || Die "Failed to copy $j to $MONDO_ROOT"
+            if [ _"$MONDO_SHARE" != _"" ]; then 
+                cp -f $j $MONDO_ROOT 2>> $LOGFILE || Die "Failed to copy $j to $MONDO_ROOT"
+            fi
         fi
     done
     MakeSyslinuxMessageFile $MINDI_TMP/iso/isolinux/message.txt
-    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?"
-    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?"
+    cp $kernelpath $MINDI_TMP/iso/isolinux/vmlinuz 2>> $LOGFILE || Die "Cannot copy vmlinuz ($kernelpath) to mindi tmp ($MINDI_TMP/iso/isolinux/vmlinuz). Did you run out of disk space?"
     cp $MINDI_TMP/mindi.rdz $MINDI_TMP/iso/isolinux/initrd.img 2>> $LOGFILE
-    cp $MINDI_TMP/mindi.rdz $MONDO_ROOT/initrd.img 2>> $LOGFILE
+    if [ _"$MONDO_SHARE" != _"" ]; then 
+        cp $kernelpath $MONDO_ROOT/vmlinuz 2>> $LOGFILE || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"/dev/null 
+        cp $MINDI_TMP/mindi.rdz $MONDO_ROOT/initrd.img 2>> $LOGFILE || Die "Cannot copy mindi.rdz ($MINDI_TMP/mindi.rdz) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"
+
+    fi
     [ -e "$iso_cfg_file" ] || Die "FIXME - unable to find $iso_cfg_file - this should never occur"
     cd $MINDI_TMP/iso/isolinux
-    cat $iso_cfg_file | HackSyslinuxFile $ramdisk_size $MINDI_TMP/iso > isolinux.cfg || Die "Cannot copy isolinux.cfg from mindi_home to tmp_root - did you run out of disk space?"
+    cat $iso_cfg_file | HackSyslinuxFile $ramdisk_size $MINDI_TMP/iso > isolinux.cfg || Die "Cannot copy isolinux.cfg to $MINDI_TMP/iso/isolinux - did you run out of disk space?"
     if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
-        mv isolinux.cfg isolinux.cfg.old
-        sed s/interactive/iso/ isolinux.cfg.old > isolinux.cfg
+        perl -pi -e 's/interactive/iso/' isolinux.cfg
     fi
     if [ "$ARCH" != "ia64" ] ; then
-        cp $ISOLINUX isolinux.bin 2> /dev/null || Die "Cannot copy isolinux.bin ($ISOLINUX) to tmp_root - did you run out of disk space?"
+        cp $ISOLINUX isolinux.bin 2> /dev/null || Die "Cannot copy isolinux.bin ($ISOLINUX) to $MINDI_TMP/iso/isolinux - did you run out of disk space?"
         cp $ISOLINUX ../ 2>> $LOGFILE
     fi
     cd $MINDI_TMP/iso
     if [ "$ARCH" != "ia64" ] ; then
-        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?"
-    fi
-    [ "$MONDO_SHARE" ] && cp -f $MONDO_SHARE/autorun .    2>> $LOGFILE
-    if [ "$ARCH" != "ia64" ] ; then
-        mkisofs -U -J -r -o $MINDI_CACHE/mindi.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table . > /dev/null 2> $MINDI_TMP/mkisofs.log
-    else
-        mkisofs -J -r -o $MINDI_CACHE/mindi.iso -b images/mindi-bootroot.$BOOT_SIZE.img -c isolinux/boot.cat -no-emul-boot . > /dev/null 2> $MINDI_TMP/mkisofs.log
+        if [ _"$MONDO_SHARE" != _"" ]; then 
+            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 (under $MONDO_ROOT). Did you run out of disk space?"
+            cp -f $MONDO_SHARE/autorun . 2>> $LOGFILE
+        fi
+        $ISO_CMD -U $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table . > /dev/null 2> $MINDI_TMP/mkisofs.log
+    else
+        $ISO_CMD $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b images/mindi-bootroot.$BOOT_SIZE.img -c isolinux/boot.cat -no-emul-boot . > /dev/null 2> $MINDI_TMP/mkisofs.log
     fi
     if [ "$?" -ne "0" ] ; then
-        echo "----------- mkisofs's errors --------------" >> $LOGFILE
+        echo "----------- $ISO_CMD's errors --------------" >> $LOGFILE
         cat $MINDI_TMP/mkisofs.log >> $LOGFILE
-        echo "mkisofs returned the following errors:-"
+        echo "$ISO_CMD returned the following errors:-"
         cat $MINDI_TMP/mkisofs.log
         LogIt "Failed to create ISO image."
@@ -1872 +1834 @@
 
 MakeMessageFile() {
-    local disksize
-    disksize=$1
     if [ "`grep -Fi "debian" /etc/issue.net 2> /dev/null`" ] ; then
         sed s/ZZZZZ/$MINDI_VERSION/ $MINDI_LIB/msg-txt | sed s/YYYYY/"Mondo Rescue"/ | sed s/XXXXX/"a cousin of"/ | sed s%DDDDD%"Debian GNU\/`uname -s` `cut -d ' ' -f 3 /etc/issue.net` `hostname`"% | sed s/KKKKK/"Kernel `uname  -r` on a `uname -m`"/ | sed s/TTTTT/"`LC_TIME=C date`"/
@@ -1879 +1839 @@
         sed s/ZZZZZ/$MINDI_VERSION/ $MINDI_LIB/msg-txt | sed s/YYYYY/"Mondo Rescue"/ | sed s/XXXXX/"a cousin of"/ | sed s/DDDDD/"`grep -i "linux" /etc/issue.net | head -n1 | tr -s ' ' ' '`"/ | sed s/KKKKK/"`grep -i "kernel" /etc/issue.net | head -n1 | tr -s ' ' ' '`"/ | sed s/TTTTT/"`LC_TIME=C date`"/ | sed s/' 'r' 'on' 'an' 'm/' '`uname -r`' 'on' 'an' '`uname -m`/
     fi
-    if [ "$disksize" -gt "2880" ] ; then
-        if [ _"$MONDO_SHARE" != _"" ] ; then
-            if [ "$CDRECOVERY" != "yes" ] ; then
-                if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
-                    echo -en "Press <enter> to continue.\n"
-                elif [ ! "$MINDI_TMP" ] ; then
-                    echo -en "FYI, this is _not_ a Mondo Rescue CD.\n"
-                else
-                    echo -en "$BOOT_MEDIA_MESSAGE"
-                fi
+    if [ _"$MONDO_SHARE" != _"" ]; then
+        if [ "$CDRECOVERY" != "yes" ] ; then
+            if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
+                echo -en "Press <enter> to continue.\n"
+            elif [ ! "$MINDI_TMP" ] ; then
+                echo -en "FYI, this is _not_ a Mondo Rescue CD.\n"
+            else
+                echo -en "$BOOT_MEDIA_MESSAGE"
             fi
         fi
@@ -1901 +1859 @@
 
 
-write_full_floppy_of_kernel() {
-    local mtpt image old_pwd res disksize
-
-    res=0
-    old_pwd=`pwd`
-    KERN_DISK_MADE=1
-    disksize=$3
-    rand1=$RANDOM
-    rand2=$RANDOM
-    image=$MINDI_TMP/$rand1.$rand2.img
-    mtpt=$MINDI_TMP/$rand1.$rand2.mtpt
-    dd if=/dev/zero of=$image bs=1k count=$disksize &> /dev/null
-    mke2fs -N 26 -F $image &> /dev/null
-    mkdir -p $mtpt
-    mount -o loop $image $mtpt
-    cd $mtpt
-    mkdir -p {dev,tmp,boot}
-    cp -f $1 vmlinuz 2>> $LOGFILE
-    if [ "$?" -ne "0" ] ; then
-        LogIt "Failed to copy $1 to ramdisk"
-        cd $old_pwd
-        umount $mtpt
-        rmdir $mtpt
-        rm $image
-        return 1
-    fi
-
-    rdev vmlinuz 2,0
-    rdev -R vmlinuz 0
-    rdev -r vmlinuz 49152
-
-    tar -zxf $MINDI_LIB/dev.tgz || LogIt "Cannot untar dev.tgz"
-    # BERLIOS : Useless and generating errors on CentOS ? (losetup miss a param)
-    #losetup /dev/loop0 > /dev/null 2> /dev/null
-    #[ "$?" -eq "0" ] || losetup /dev/loop0 -d || Die "Please free up /dev/loop0 by typing 'losetup /dev/loop0 -d'.\nReboot if necessary."
-    CopyBootBFile $mtpt/boot.b
-
-    MakeLiloConfFile $disksize >> bdlilo.conf
-
-    chmod 644 bdlilo.conf
-    MakeMessageFile $disksize > message
-    lilo -v -C bdlilo.conf -r $mtpt
-    res=$?
-
-    cd $old_pwd
-    umount $mtpt
-    mv -f $image $2
-    rmdir $mtpt
-
-    return $res
-}
-
-
 MakeLiloConfFile() {
-    local disksize options i ooo
-    disksize=$1
+    local options i ooo
     options=""
 
     if [ "$ARCH" != "ia64" ] ; then
         echo -en "boot=/dev/loop0\ndisk=/dev/loop0\n"
-    fi
-    if [ "$disksize" -eq "2880" ] ; then
-        echo -en "bios=0x00\nsectors=36\nheads=2\ncylinders=80\n"
-    elif [ "$disksize" -eq "1722" ] ; then
-        echo -en "bios=0x00\nsectors=21\nheads=2\ncylinders=82\n"
-    elif [ "$disksize" -gt "2880" ] ; then
-        /bin/true
-    else
-        echo -en "bios=0x00\nsectors=18\nheads=2\ncylinders=80\n"
-    fi
-    if [ "$ARCH" != "ia64" ] ; then
         echo -en "install=/boot.b\nmap=/boot.map\n"
     fi
     if [ "$CDRECOVERY" = "yes" ] ; then
         echo -en "default=RESTORE\n"
-    elif [ "$disksize" -gt "2880" ] && [ _"$MONDO_SHARE" != _"" ] ; then
+    elif [ _"$MONDO_SHARE" != _"" ]; then
         if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
             echo -en "default=iso\n"
@@ -1996 +1889 @@
     if [ "$CDRECOVERY" = "yes" ] ; then
         options="RESTORE expert"
-    elif [ "$disksize" -gt "2880" ] ; then
-        if [ _"$MONDO_SHARE" != _"" ] ; then
+    else
+        if [ _"$MONDO_SHARE" != _"" ]; then
             if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
                 options="iso"
@@ -2007 +1900 @@
             options="expert"
         fi
-    else
-        options="expert"
     fi
     for i in $options ; do
@@ -2022 +1913 @@
         outstr=$outstr" $ooo_mode"
         outstr=$outstr"\"\n"
-        if [ "$disksize" = "1440" ] ; then
-            echo -en "$outstr" | sed s/initrd=.*// | grep -v root=
-        else
-            echo -en "$outstr"
-        fi
+        echo -en "$outstr"
     done
 }
@@ -2032 +1919 @@
 
 PrepareBootDiskImage_LILO() {
-    local disksize imagesdir dev imagefile mountpoint fname i kernelpath ramdisksize cfg_file testpath options retval outstr old_pwd ooo max_kernel_size liloconf
+    local imagesdir dev imagefile mountpoint fname i kernelpath ramdisksize cfg_file testpath options retval outstr old_pwd ooo max_kernel_size liloconf
     imagesdir=$1
-    disksize=$2
-    kernelpath=$3
-    ramdisksize=$4
+    kernelpath=$2
+    ramdisksize=$3
 
     retval=0
     [ ! -e "$kernelpath" ] && Die "PBDI - cannot find $kernelpath kernel"
-    echo -en "Making "$disksize"KB boot disk..."
-    TurnTgzIntoRdz $MINDI_LIB/rootfs $MINDI_TMP/mindi.rdz $ramdisksize $disksize `du -sk $kernelpath | cut -f1` || Die "Could not turn rootfs into mindi.rdz; are you SURE your kernel supports loopfs?"
-    if [ "$ARCH" != "ia64" ] ; then
-        [ "$disksize" != "1722" ] && [ "$disksize" != "2880" ] && [ "$disksize" != "$BOOT_SIZE" ] && Die "PDBI - disksize is $disksize - bad size"
-    fi
+    echo -en "Making "$BOOT_SIZE"KB boot disk..."
+    TurnTgzIntoRdz $MINDI_LIB/rootfs $MINDI_TMP/mindi.rdz $ramdisksize `du -sk $kernelpath | cut -f1` || Die "Could not turn rootfs into mindi.rdz; are you SURE your kernel supports loopfs?"
     echo -en "..."
-    imagefile=$imagesdir/mindi-bootroot.$disksize.img
+    imagefile=$imagesdir/mindi-bootroot.$BOOT_SIZE.img
     mountpoint=$MINDI_TMP/mountpoint.$$
     mkdir -p $mountpoint
-    dd if=/dev/zero of=$imagefile bs=1k count=$disksize &> /dev/null || Die "Cannot dd blank file"
+    dd if=/dev/zero of=$imagefile bs=1k count=$BOOT_SIZE &> /dev/null || Die "Cannot dd blank file"
     if [ "$ARCH" = "ia64" ] ; then
         mkdosfs $imagefile >> $LOGFILE 2>> $LOGFILE
@@ -2077 +1960 @@
     CopyBootBFile $mountpoint/boot.b
 
-    MakeLiloConfFile $disksize > $liloconf
+    MakeLiloConfFile > $liloconf
 
     # Copy it so that CD-ROM menu entry is satisfied
@@ -2109 +1992 @@
         retval=$(($retval+1))
     fi
-    MakeMessageFile $disksize > $mountpoint/message
+    MakeMessageFile > $mountpoint/message
 
     mkdir -p $mountpoint/tmp
@@ -2124 +2007 @@
     free_space=`df -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
     cp -f $kernelpath $mountpoint/vmlinuz > /dev/null 2> /dev/null
-    if [ "$?" -ne "0" ] || [ "$FORCE_DUAL_FLOPPIES" = "yes" ] ; then
+    if [ "$?" -ne "0" ] ; then
         echo "Files at mountpoint ($mountpoint) :-" >> $LOGFILE
         du -sk $mountpoint/* >> $LOGFILE
         echo "--- end of list of files ---" >> $LOGFILE
         echo -en "Kernel size = `du -sk $kernelpath | cut -f1` K\nRamdisk free = $free_space K\n\
-Sorry, your kernel is too big for a boot/root floppy.\nI'll try the new boot/root two-disk thingy.\n" >> $LOGFILE
+Sorry, your kernel is too big for your image.\n" >> $LOGFILE
         rm -f $mountpoint/vmlinuz
         cd $old_pwd
@@ -2135 +2018 @@
         rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)"
     #   losetup /dev/loop0 -d
-        res=0
-        write_full_floppy_of_kernel $kernelpath $imagesdir/mindi-boot.1440.img 1440
-        res=$(($res+$?))
-        cp -f $MINDI_TMP/mindi.rdz $imagesdir/mindi-root.1440.img 2>> $LOGFILE
-        res=$(($res+$?))
         rm -f $imagefile
-        if [ "$res" -ne "0" ]; then
-            LogIt "WARNING - failed to create 1.44MB boot/root floppies"
-            rm -f $imagesdir/mindi-*.1440.img
-        fi
-        return $res
+        return 0
     fi
     free_space=`df -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
     max_kernel_size=$(($free_space+`du -sk $kernelpath | cut -f1`))
-    echo "Free space left on floppy = $free_space KB" >> $LOGFILE
-    echo "Max kernel size on $disksize KB floppy (est'd) = $max_kernel_size K" >> $LOGFILE
+    echo "Free space left on image = $free_space KB" >> $LOGFILE
+    echo "Max kernel size on $BOOT_SIZE KB image (est'd) = $max_kernel_size K" >> $LOGFILE
     # make it bootable
     rm -f $mountpoint/zero
     [ -e "$MINDI_LIB/memdisk" ] && cp -f $MINDI_LIB/memdisk $mountpoint 2>> $LOGFILE
-    if [ "$disksize" -gt "2880" ] && [ ! "$KERN_DISK_MADE" ] ; then
+    if [ ! "$KERN_DISK_MADE" ] ; then
         if [ "$ARCH" != "ia64" ] ; then
             $LILO_EXE $LILO_OPTIONS -r $mountpoint >> $LOGFILE 2>> $LOGFILE
@@ -2160 +2034 @@
             /bin/true
         fi
-    elif [ ! "$KERN_DISK_MADE" ] ; then
-        # 12/28/2001 - if 1.72MB floppy then don't use LILO's optimizations at all
-        $LILO_EXE -r $mountpoint >> $LOGFILE 2>> $LOGFILE
     else
         echo "Not running LILO. It's not that kind of disk." >> $LOGFILE
@@ -2187 +2058 @@
     rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)"
     if [ "$retval" -eq "0" ] ; then
-        echo -en "...$DONE\r"
+        echo -en "...$DONE\n"
         if [ "$KERN_DISK_MADE" ] ; then
-            LogIt "... $disksize KB boot disks were created OK\r"
-        fi
-    else
-        echo -en "...failed\r"
-        LogIt $disksize"KB boot disk was NOT created\r"
+            LogIt "$BOOT_SIZE KB boot disks were created OK\n"
+        fi
+    else
+        echo -en "...failed\n"
+        LogIt $BOOT_SIZE"KB boot disk was NOT created\n"
         rm -f $imagefile
     fi
@@ -2202 +2073 @@
 
 PrepareBootDiskImage_SYSLINUX() {
-    local disksize imagesdir dev imagefile mountpoint fname i kernelpath ramdisksize cfg_file testpath options retval outstr old_pwd ooo max_kernel_size bootimage
+    local imagesdir dev imagefile mountpoint fname i kernelpath ramdisksize cfg_file testpath options retval outstr old_pwd ooo max_kernel_size bootimage
     imagesdir=$1
-    disksize=$2
-    kernelpath=$3
-    ramdisksize=$4
+    kernelpath=$2
+    ramdisksize=$3
     do_boot_root_thingy=""
     local retval old_pwd
@@ -2212 +2082 @@
 
     [ ! -e "$kernelpath" ] && Die "PBDI - cannot find $kernelpath kernel"
-    echo -en "Making "$disksize"KB boot disk..."
-    TurnTgzIntoRdz $MINDI_LIB/rootfs $MINDI_TMP/mindi.rdz $ramdisksize $disksize `du -sk $kernelpath | cut -f1` || Die "Could not turn rootfs into mindi.rdz; are you SURE your kernel supports loopfs?"
-    [ "$disksize" != "1722" ] && [ "$disksize" != "2880" ] && [ "$disksize" != "$BOOT_SIZE" ] && Die "PDBI - disksize is $disksize - bad size"
+    echo -en "Making "$BOOT_SIZE"KB boot disk..."
+    TurnTgzIntoRdz $MINDI_LIB/rootfs $MINDI_TMP/mindi.rdz $ramdisksize `du -sk $kernelpath | cut -f1` || Die "Could not turn rootfs into mindi.rdz; are you SURE your kernel supports loopfs?"
     echo -en "..."
-    imagefile=$imagesdir/mindi-bootroot.$disksize.img
+    imagefile=$imagesdir/mindi-bootroot.$BOOT_SIZE.img
     mountpoint=$MINDI_TMP/mountpoint.$$
     mkdir -p $mountpoint
-# If I format a 1722KB data file & run syslinux on it, the resultant image
-# won't boot. So, I have formatted a floppy, called syslinux on/to it, and
-# used 'dd' to copy it to sys-disk.raw (zipped to sys-disk.raw.gz).
-# If I extract it, mount it, copy my files to it, etc. then the resultant
-# image _is_ bootable. I don't know why syslinux and/or mkfs.vfat won't
-# play nicely and I don't care. :) I have worked around the problem. -Hugo, 06/27/2002
-    if [ "$disksize" = "1722" ] ; then
-        gzip -dc $MINDI_LIB/sys-disk.raw.gz > $imagefile || Die "Cannot dd blank file"
-    else
-        dd if=/dev/zero of=$imagefile bs=1k count=$disksize &> /dev/null || Die "Cannot dd blank file"
-        mkfs.vfat $imagefile >> $LOGFILE 2>> $LOGFILE
-        syslinux $imagefile >> $LOGFILE 2>> $LOGFILE
-    fi
+    dd if=/dev/zero of=$imagefile bs=1k count=$BOOT_SIZE &> /dev/null || Die "Cannot dd blank file"
+    echo "Creating vfat filesystem on $imagefile" >> $LOGFILE
+    mkfs.vfat $imagefile >> $LOGFILE 2>> $LOGFILE
+    syslinux $imagefile >> $LOGFILE 2>> $LOGFILE
+
     mount -t vfat -o loop $imagefile $mountpoint || LogIt "Cannot mount (PBDI)"
 
@@ -2241 +2102 @@
     cat $sys_cfg_file | HackSyslinuxFile $ramdisk_size $mountpoint > syslinux.cfg || Die "Cannot copy syslinux.cfg from mindi_home to tmp_root"
     if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
-        mv syslinux.cfg syslinux.cfg.orig
-        sed s/interactive/iso/ syslinux.cfg.orig > syslinux.cfg
+        perl -pi -e 's/interactive/iso/' syslinux.cfg
     fi
     cd $old_pwd
@@ -2264 +2124 @@
     free_space=`df -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
     cp -f $kernelpath $mountpoint/vmlinuz &> /dev/null
-    if [ "$?" -ne "0" ] || [ "$FORCE_DUAL_FLOPPIES" = "yes" ] ; then
+    if [ "$?" -ne "0" ] ; then
         echo "Files at mountpoint ($mountpoint) :-" >> $LOGFILE
         du -sk $mountpoint/* >> $LOGFILE
         echo "--- end of list of files ---" >> $LOGFILE
         echo -en "Kernel size = `du -sk $kernelpath | cut -f1` K\nRamdisk free = $free_space K\n\
-Sorry, your kernel is too big for a boot/root floppy.\nI'll try the new boot/root two-disk thingy.\n" >> $LOGFILE
+Sorry, your kernel is too big for your image.\n" >> $LOGFILE
         rm -f $mountpoint/vmlinuz
         cd $old_pwd
@@ -2275 +2135 @@
         rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)"
 
-        res=0
-        write_full_floppy_of_kernel $kernelpath $imagesdir/mindi-boot.1440.img 1440
-        res=$(($res+$?))
-        cp -f $MINDI_TMP/mindi.rdz $imagesdir/mindi-root.1440.img 2>> $LOGFILE
-        res=$(($res+$?))
         rm -f $imagefile
-        if [ "$res" -ne "0" ]; then
-            LogIt "WARNING - failed to create 1.44MB boot/root floppies"
-            rm -f $imagesdir/mindi-*.1440.img
-        fi
-        return $res
+        return 0
     fi
     free_space=`df -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
     max_kernel_size=$(($free_space+`du -sk $kernelpath | cut -f1`))
-    echo "Free space left on floppy = $free_space KB" >> $LOGFILE
-    echo "Max kernel size on $disksize KB floppy (est'd) = $max_kernel_size K" >> $LOGFILE
+    echo "Free space left on image = $free_space KB" >> $LOGFILE
+    echo "Max kernel size on $BOOT_SIZE KB image (est'd) = $max_kernel_size K" >> $LOGFILE
 
     # make it bootable
@@ -2301 +2152 @@
 
     if [ "$retval" -eq "0" ] ; then
-        echo -en "...$DONE\r"
+        echo -en "...$DONE\n"
         if [ "$KERN_DISK_MADE" ] ; then
             rm -f $imagefile
-            LogIt "... $disksize KB boot disks were created OK\r"
-        fi
-    else
-        echo -en "...failed\r"
-        LogIt $disksize"KB boot disk was NOT created\r"
+            LogIt "$BOOT_SIZE KB boot disks were created OK\n"
+        fi
+    else
+        echo -en "...failed\n"
+        LogIt $BOOT_SIZE"KB boot disk was NOT created\n"
         rm -f $imagefile
     fi
@@ -2317 +2168 @@
 
 PrepareDataDiskImages() {
-    local needlist bigdir minidir_root tardir diskdir imagesdir res i j k old_pwd lines
+    local needlist bigdir minidir_root tardir diskdir imagesdir res i j k old_pwd lines lfiles
 
     imagesdir=$1
@@ -2328 +2179 @@
     tardir=$MINDI_TMP/tardir
 
-    lines=`grep -vx " *#.*" $MINDI_CONF/deplist.txt | grep -vx "" | wc -l`
-    cat $MINDI_CONF/deplist.txt | GenerateGiantDependencyList $needlist $lines
+    lfiles="$DEPLIST_FILE"
+    lines=`grep -vx " *#.*" $lfiles | grep -vx "" | wc -l`
+    cat $lfiles | GenerateGiantDependencyList $needlist $lines
     res=$?
     if [ "$YOUR_KERNEL_SUCKS" ]; then
@@ -2365 +2217 @@
     FindAndAddUserKeyboardMappingFile
     mkdir -p $bigdir/tmp
-    if [ _"$MONDO_SHARE" != _"" ] ; then
+    if [ _"$MONDO_SHARE" != _"" ]; then
         MakeMondoConfigFile $MINDI_TMP/mondo-restore.cfg
         cp -f $MINDI_TMP/mondo-restore.cfg $bigdir/tmp &> /dev/null
@@ -2414 +2266 @@
     noof_disks=$?
     [ "$noof_disks" -eq "0" ] && Die "Too much stuff!"
-#    if [ "$noof_disks" -ge "8" ] ; then
-#        LogIt "You are putting a ludicrously large amount of data on these disks."
-#        LogIt "I shall therefore double EXTRA_SPACE, just in case your ramdisk is too small."
-#        EXTRA_SPACE=$(($EXTRA_SPACE*2))
-#    fi
     MakeMountlist $MINDI_TMP/mountlist.txt
     mkdir -p $minidir_root/$noof_disks/tmp
     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"
-    [ _"$MONDO_SHARE" != _"" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MINDI_TMP/. 2>> $LOGFILE
+    if [ _"$MONDO_SHARE" != _"" ]; then
+        cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MINDI_TMP/. 2>> $LOGFILE
+    fi
     [ $LVM != "false" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm || LVM="false"
     cat $minidir_root/$noof_disks/tmp/mountlist.txt >> $LOGFILE
@@ -2792 +2641 @@
 
 TurnTgzIntoRdz() {
-    local tgz_dir_fname rdz_fname ramdisksize tempfile mountpoint old_pwd nodes disksize kernelsize maxsize res currsize not_copied j k floppy_modules s w
+    local tgz_dir_fname rdz_fname ramdisksize tempfile mountpoint old_pwd nodes kernelsize maxsize res currsize not_copied j k s w needed_modules_path
 
     tgz_dir_fname=$1
     rdz_fname=$2
     ramdisksize=$3
-    disksize=$4
-    kernelsize=$5
-    maxsize=$(($disksize-$kernelsize))
+    kernelsize=$4
+    maxsize=$(($BOOT_SIZE-$kernelsize))
     maxsize=$(($maxsize*2)); # to allow for compression of 50%
     tempfile=$MINDI_TMP/temp.rd
@@ -2903 +2751 @@
     fi
 
-    for w in cdrom floppy groovy-stuff ; do
+    for w in cdrom groovy-stuff ; do
         mkdir -p mnt/$w
     done
@@ -2922 +2770 @@
     if [ "$YOUR_KERNEL_SUCKS" ] ; then
         cd $MINDI_TMP
-        floppy_modules_path=lib/modules/$FAILSAFE_KVER
+        needed_modules_path=lib/modules/$FAILSAFE_KVER
     else
         cd /
-###
-### Sq-Modification... Use kernel name in module path if specified.
-###
-        #floppy_modules_path=lib/modules/`uname -r`
         if [ "${kernelname}" != "" ]
         then
-            floppy_modules_path=lib/modules/${kernelname}
+            needed_modules_path=lib/modules/${kernelname}
         else
-            floppy_modules_path=lib/modules/`uname -r`
-        fi
-###
-### Sq-Modification end
-###
-    fi
-    floppy_modules=""
-    if [ "$disksize" -lt "2880" ] ; then
-        list_of_groovy_mods="$FLOPPY_MODS $FORCE_MODS $IDE_MODS ide-scsi sr_mod cdrom isocd isofs `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
-    else
-        list_of_groovy_mods="$CDROM_MODS $FORCE_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
-    fi
+            needed_modules_path=lib/modules/`uname -r`
+        fi
+    fi
+
+    needed_modules=""
+    list_of_groovy_mods="$CDROM_MODS $FORCE_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
+
     if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
         # For PXE boot
@@ -2957 +2796 @@
     done
 
-    [ -e "$floppy_modules_path" ] || LogIt "path $floppy_modules_path does not exist.\n If you're not using a modular kernel then you're NUTS."
+    [ -e "$needed_modules_path" ] || LogIt "path $needed_modules_path does not exist.\n If you're not using a modular kernel then you're NUTS."
     for i in $list_of_groovy_mods ; do
-        floppy_modules="$floppy_modules `FindSpecificModuleInPath $floppy_modules_path $i`"
-    done
-    for i in $floppy_modules ; do
+        needed_modules="$needed_modules `FindSpecificModuleInPath $needed_modules_path $i`"
+    done
+    for i in $needed_modules ; do
         [ -e "$i" ] && s=`du -sk $i | cut -f1` || s=""
         [ "$YOUR_KERNEL_SUCKS" ] && i=$MINDI_TMP/$i
@@ -2976 +2815 @@
 
     # Also copy modules.dep in case of udev so that normal modprobe works
-    cp --parents -pdf /$floppy_modules_path/modules.dep $mountpoint 2>/dev/null || LogIt "Unable to copy modules.dep to $mountpoint"
+    cp --parents -pdf /$needed_modules_path/modules.dep $mountpoint 2>/dev/null || LogIt "Unable to copy modules.dep to $mountpoint"
 
     # For all modules supported, create symlinks under the mountpoint
@@ -2985 +2824 @@
         (cd $mountpoint ; ln -s $i . 2>/dev/null)
     done
-    if [ ! -e "/sbin/devfsd" ] || [ "$disksize" -lt "2880" ] || [ "$kernelpath" = "$MINDI_LIB/vmlinuz" ] ; then
+    if [ ! -e "/sbin/devfsd" ] || [ "$kernelpath" = "$MINDI_LIB/vmlinuz" ] ; then
         echo "Deleting devfsd daemon from ramdisk" >> $LOGFILE
         [ ! -e "/sbin/devfsd" ] && echo "...because /sbin/devfsd not found" >> $LOGFILE
-        [ "$disksize" -lt "2880" ] && echo "...because disksize = $disksize" >> $LOGFILE
         [ "$kernelpath" = "$MINDI_LIB/vmlinuz" ] && echo "...because kernel is failsafe" >> $LOGFILE
         rm -f $mountpoint/sbin/devfsd
@@ -2996 +2834 @@
     dd if=/dev/zero of=$mountpoint/zero &> /dev/null
     rm -f $mountpoint/zero
-    if [ _"$MONDO_SHARE" != _"" ] ; then
+    mkdir -p $mountpoint/tmp
+    if [ _"$MONDO_SHARE" != _"" ]; then
         MakeMondoConfigFile $mountpoint/tmp/mondo-restore.cfg
         cp -f $mountpoint/tmp/mondo-restore.cfg $MINDI_TMP &> /dev/null
@@ -3007 +2846 @@
         [ "$USE_STAR" = "yes" ] && echo -en "Using star. Hooray." >> $mountpoint/tmp/USING-STAR
     fi
-    mkdir -p $mountpoint/tmp
     mkdir -p $mountpoint/proc
-    echo "$disksize" > $mountpoint/tmp/$disksize.siz
-    find $mountpoint -name CVS -exec rm -rf '{}' \;
+    echo "$BOOT_SIZE" > $mountpoint/tmp/$BOOT_SIZE.siz
     # Determine what filesystem to use for initrd image
     echo "Call GetInitrdFilesystemToUse() with parameter ${kernelpath} to get filesystem to use for initrd." >> $LOGFILE
@@ -3112 +2949 @@
 ##############################################################################
 
+# Now we can create what we need
+mkdir -p $MINDI_TMP
+
+# Purge from potential old run
+if [ _"$MINDI_CACHE" = _"" ]; then
+    Die "MINDI_CACHE undefined"
+fi
+rm -rf $MINDI_CACHE/* 2> /dev/null
+mkdir -p $MINDI_CACHE
+
+if [ "$1" = "--printvar" ] ; then
+    shift
+    if [ _"$1" != _"" ] ; then
+        set | grep -Ew "^$1" | cut -d= -f2
+    fi
+    MindiExit 0
+fi
 
 > $LOGFILE
@@ -3129 +2983 @@
 # Log some capital variables
 [ "$MINDI_PREFIX" = "XXX" ] && Die "Mindi has not been installed correctly."
+echo "MONDO_SHARE = $MONDO_SHARE" >> $LOGFILE
 echo "MINDI_LIB = $MINDI_LIB" >> $LOGFILE
 echo "MINDI_SBIN = $MINDI_SBIN" >> $LOGFILE
 [ "$MINDI_CONF" = "YYY" ] && Die "Mindi has not been installed correctly."
 echo "MINDI_CONF = $MINDI_CONF" >> $LOGFILE
-echo "MONDO_SHARE = $MONDO_SHARE" >> $LOGFILE
+if [ -f $MINDI_CONFIG ]; then
+    echo "-----------------------------" >> $LOGFILE
+    echo " Mindi configuration file    " >> $LOGFILE
+    echo "-----------------------------" >> $LOGFILE
+    grep -Ev '^#' $MINDI_CONFIG >> $LOGFILE
+    echo "-----------------------------" >> $LOGFILE
+fi
+
 
 trap AbortHere SIGTERM SIGHUP SIGQUIT SIGKILL SIGABRT SIGINT
@@ -3175 +3037 @@
 fi
 
-[ -f "$MINDI_LIB/vmlinuz" ] && FAILSAFE_KVER=`strings $MINDI_LIB/vmlinuz 2> /dev/null | grep -E "2\.[46]" | cut -d' ' -f1`
+# If we have a distribution-specific script for finding a FAILSAFE kernel, use it.
+if [ -f "$MINDI_LIB/FindDistroFailsafe" ] && [ ! "$1" = "--makemountlist" ] && [ "$kernelpath" = "FAILSAFE" ]; then
+    source $MINDI_LIB/FindDistroFailsafe
+    # Log kernel image
+    LogIt "FAILSAFE kernel image to be used is: $FAILSAFE_KBIN ($FAILSAFE_KVER)"
+else
+    [ -f "$MINDI_LIB/vmlinuz" ] && FAILSAFE_KVER=`strings $MINDI_LIB/vmlinuz 2> /dev/null | grep -E "2\.[46]" | cut -d' ' -f1`
+fi
 
 if ! which mkfs.vfat 1> /dev/null 2> /dev/null ; then
@@ -3193 +3062 @@
     FindLiloBinary
 fi
-# BERLIOS: Remove as too dangerous and now useless
-#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
 trap "Aborted" SIGTERM
 DONE="\r\t\t\t\t\t\t\t\tDone.         "
@@ -3495 +3362 @@
 fi
 if [ _"$MONDO_SHARE" = _"" ] && [ "$ARCH" != "ia64" ]; then
-    echo -en "Would you like to use LILO (instead of syslinux)\nfor your boot CD/floppies (y/[n]) ?"
+    echo -en "Would you like to use LILO (instead of syslinux)\nfor your boot image (y/[n]) ?"
     read ch
     if [ "$ch" != "y" ] && [ "$ch" != "Y" ] ; then
@@ -3504 +3371 @@
 fi
 if [ "$YOUR_KERNEL_SUCKS" != "" ] || [ "$kernelpath" = "" ] || [ "$kernelpath" = "SUCKS" ] || [ "$kernelpath" = "FAILSAFE" ] ; then
-    kernelpath=$MINDI_LIB/vmlinuz
-    LogIt "I shall include Mindi's failsafe kernel, not your kernel, in the boot disks."
-    LogIt "However, you are still running your kernel. If Mindi fails to create your"
-    LogIt "disks then it may still be a result of a problem with your kernel."
-    pwd=`pwd`
-    cd $MINDI_TMP
-    bzip2 -dc $MINDI_LIB/lib.tar.bz2 | tar -x || Die "Cannot unzip lib.tar.bz2"
-    cd $pwd
+    # If we have a distribution-specific script for finding a FAILSAFE kernel, use it.
+    if [ -f "$MINDI_LIB/FindDistroFailsafe" ] && [ ! "$1" = "--makemountlist" ]; then
+        source $MINDI_LIB/FindDistroFailsafe
+        # Log kernel image
+        LogIt "FAILSAFE kernel image to be used is: $FAILSAFE_KBIN ($FAILSAFE_KVER)"
+        kernelpath="$FAILSAFE_KBIN"
+        LogIt "I shall include a failsafe kernel, not your kernel, in the boot disks.\n"
+        LogIt "The failsafe kernel is $kernelpath.\n"
+        LogIt "However, you are still running your kernel. If Mindi fails to create your\n"
+        LogIt "disks then it may still be a result of a problem with your kernel.\n"
+        pwd=`pwd`
+        cd $MINDI_TMP
+        mkdir -p lib/modules
+        cp -a "/lib/modules/$FAILSAFE_KVER" "lib/modules/$FAILSAFE_KVER" || Die "Cannot copy kernel modules."
+        cd $pwd
+    else
+        kernelpath=$MINDI_LIB/vmlinuz
+        LogIt "I shall include Mindi's failsafe kernel, not your kernel, in the boot disks."
+        LogIt "However, you are still running your kernel. If Mindi fails to create your"
+        LogIt "disks then it may still be a result of a problem with your kernel."
+        pwd=`pwd`
+        cd $MINDI_TMP
+        bzip2 -dc $MINDI_LIB/lib.tar.bz2 | tar -x || Die "Cannot unzip lib.tar.bz2"
+        cd $pwd
+    fi
     YOUR_KERNEL_SUCKS="Your kernel sucks"
 fi
@@ -3527 +3411 @@
 echo "Ramdisk will be $ramdisk_size KB" >> $LOGFILE
 if [ "$ARCH" = "ia64" ] ; then
-    PrepareBootDiskImage_LILO $MINDI_CACHE $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create ia64 floppy disk image."
+    PrepareBootDiskImage_LILO $MINDI_CACHE $kernelpath $ramdisk_size || Die "Failed to create ia64 image disk image."
 else
     if [ "$USE_LILO" = "yes" ] ; then
-        if ! PrepareBootDiskImage_LILO $MINDI_CACHE 1722 $kernelpath $ramdisk_size ; then
-            LogIt "WARNING - failed to create 1.72MB boot image."
-            LogIt "Please reduce your kernel's size if you want to make a 1.72MB floppy disk."
-        fi
-        if ! PrepareBootDiskImage_LILO $MINDI_CACHE 2880 $kernelpath $ramdisk_size ;  then
-            LogIt "WARNING - failed to create 2.88MB floppy disk image."
-            LogIt "Please reduce your kernel's size if you want to make a 2.88MB floppy disk."
-            PrepareBootDiskImage_LILO $MINDI_CACHE $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
-        fi
-    else
-        if ! PrepareBootDiskImage_SYSLINUX $MINDI_CACHE 1722 $kernelpath $ramdisk_size ; then
-            LogIt "WARNING - failed to create 1.72MB boot image."
-            LogIt "Please reduce your kernel's size if you want to make a 1.72MB floppy disk."
-            if ! PrepareBootDiskImage_SYSLINUX $MINDI_CACHE 2880 $kernelpath $ramdisk_size ; then
-                LogIt "WARNING - failed to create 2.88MB floppy disk image."
-                LogIt "Please reduce your kernel's size if you want to make a 2.88MB floppy disk."
-                PrepareBootDiskImage_SYSLINUX $MINDI_CACHE $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create $BOOT_SIZE kB floppy disk image."
-            fi
-        fi
+        PrepareBootDiskImage_LILO $MINDI_CACHE $kernelpath $ramdisk_size || Die "Failed to create $BOOT_SIZE MB disk image."
+    else
+        PrepareBootDiskImage_SYSLINUX $MINDI_CACHE $kernelpath $ramdisk_size || Die "Failed to create $BOOT_SIZE MB disk image."
     fi
 fi
@@ -3557 +3425 @@
 if [ _"$MONDO_SHARE" = _"" ]; then
     ListImagesForUser $MINDI_CACHE
-    boot_dev=/dev/fd0u1722
-    [ ! -e "$boot_dev" ] && mknod $boot_dev b 2 60
-    [ ! -e "$boot_dev" ] && boot_dev=/dev/fd0H1722
-    [ ! -e "$boot_dev" ] && Die "Oh Lord, will you PLEASE tell the vendor to create the 1.72MB devices in /dev?"
-    if [ "$PROMPT_WRITE_BOOT_FLOPPIES" = "yes" ]; then
-        OfferToCopyImagesToDisks $MINDI_CACHE $boot_dev $FDDEVICE
-    fi
+    OfferToMakeBootableISO $MINDI_CACHE
     if [ "$PROMPT_MAKE_USB_IMAGE" = "yes" ]; then
         OfferToMakeBootableUSB $MINDI_CACHE
     fi
-    OfferToMakeBootableISO $MINDI_CACHE
     LogIt "Finished."
 elif [ "$TAPEDEV" ] ; then
+    rm -f $MINDI_CACHE/{*img,*gz,*iso}
     OfferToMakeBootableISO $MINDI_CACHE
     if [ -e "$MINDI_CACHE/all.tar.gz" ] ; then

branches/2.2.5/mindi/rootfs/README

@@ -6 +6 @@
 which may be found at <http://www.mondorescue.org>.
 
-This CD (or, this set of floppy disks) contains the tools required to do
+This media image contains the tools required to do
 basic system maintenance, e.g. formatting, moving files, mounting partitions.
 

branches/2.2.5/mindi/rootfs/sbin/find-and-mount-cdrom

@@ -75 +75 @@
     exit 0
 fi
-#mount /dev/fd0u1722 -t ext2 /mnt/floppy
-[ "$1" = "--second-try" ] && exit 1; # don't try to mount floppy drive
+[ "$1" = "--second-try" ] && exit 1; 
 if [ "`grep "using-cdstream yes" /tmp/mondo-restore.cfg`" ] ; then
     LogIt "Because you are using cdstream, I won't try to mount CD."
     exit 0
 fi
-mount /dev/fd0 -t ext2 -o ro /mnt/floppy 2> /dev/null
-if [ "$?" -eq "0" ] ; then
-    umount /mnt/floppy 2> /dev/null
-    exit 1
-else
-    LogIt "Please go to another PC, mount this CD and copy the data disk images" 1
-    LogIt "from the CD's /images directory to blank 1.44MB floppy disks. You should" 1
-    LogIt "use something like 'dd if=/mnt/cdrom/images/mindi-data-1.img of=/dev/fd0'" 1
-    LogIt "for the first data disk, mindi-data-2.img for the second, and so on." 1
-    LogIt "(If you are already booting from a floppy, please ignore this message.)" 1
-    exit 2
-fi
 
-
-
-
+LogIt "Unable to find and mount your CD-ROM" 1
+LogIt "You probably miss the correct driver to support your CD-ROM drive" 1
+exit 2

branches/2.2.5/mindi/rootfs/sbin/init

@@ -124 +124 @@
         LogIt "$tapedev failed to act as extended data disk for booting." 1
         LogIt "Please specify an alternate tape device," 1
-        LogIt "or hit <Enter> to boot from CD/floppies." 1
+        LogIt "or hit <Enter> to boot from another media." 1
         echo -en "---> "
         read tapedev
@@ -140 +140 @@
     if [ "$res" -ne "0" ] ; then
         cd /
-        LogIt "Failed to use tape as extended datadisk. Reverting to floppies." 1
-        HandleCDROMorFloppies
+        LogIt "Failed to use tape as extended datadisk. Reverting to another media." 1
+        HandleCDROM
         res=$?
     else
@@ -155 +155 @@
 
 
-HandleCDROMorFloppies() {
+HandleCDROM() {
     # Just in case we have an iLO ensure we will map it correctly
     echo "$DENY_MODS" | grep -q "usb-storage "
@@ -186 +186 @@
         LogIt "OK, I am running on a CD-ROM. Good." 3
         CD_MOUNTED_OK=yes
-    elif [ "$res" -eq "1" ] ; then
-        LogIt "OK, I am running on floppies. Good." 3
-        CD_MOUNTED_OK=""
-    else
-        LogIt "OK, I am falling back to floppy mode." 3
-        LogIt "(You lay not have the right drivers" 3
-        LogIt "to support the hardware on which we are running)" 3
-        LogIt "That means you'll have to copy the data disk images from" 3
-        LogIt "the CD/hard disk/whatever to physical 1.44MB disks and" 3
-        LogIt "insert them, one after the other. Please see the manual." 3
-        LogIt "The images are in /images on the CD, or /root/images/mindi" 3
-        LogIt "on your hard disk. Your archives are probably fine but" 3
-        LogIt "your tape streamer and/or CD-ROM drive are eccentric. :-)" 3
+    else
+        LogIt "You probably not have the right drivers" 3
+        LogIt "to support the hardware on which we are running" 3
+        LogIt "Your archives are probably fine but" 3
+        LogIt "your tape streamer and/or CD-ROM drive are unsupported at that point." 3
         CD_MOUNTED_OK=""
     fi
@@ -619 +611 @@
 mount -o remount rw /
 [ ! "$GROOVY" ] && Die "I'm not groovy!"
-for i in $GROOVY /mnt/floppy /mnt/cdrom /mnt/isodir /var/local/petris /tmp/isodir; do
+for i in $GROOVY /mnt/cdrom /mnt/isodir /var/local/petris /tmp/isodir; do
     mkdir -p $i
 done
@@ -698 +690 @@
     ExtractDataDisksAndLoadModules
 else
-    HandleCDROMorFloppies
+    HandleCDROM
     ExtractDataDisksAndLoadModules
     # We need to get here exported variables from start-nfs
@@ -781 +773 @@
 else
     LogIt "backup-media-type is not specified in config file."
-    LogIt "I think this CD/floppy has no archives on it."
+    LogIt "I think this media has no archives on it."
 fi
 if grep "RESTORE" /proc/cmdline > /dev/null 2> /dev/null ; then

branches/2.2.5/mindi/rootfs/sbin/untar

@@ -14 +14 @@
 # ---------------------- main ----------------------
 
-mountpoint=/mnt/floppy
+mountpoint=/dev/null
 [ -e "/tmp/CDROM-LIVES-HERE" ] && mountpoint=/mnt/cdrom/images
 [ "$#" -eq "2" ] || Die "untar <tarball> <untar_to>"
@@ -22 +22 @@
 if [ -e "/tmp/CDROM-LIVES-HERE" ] ; then
     [ -e "$tarball" ] || LogIt "Can't find CD's $tarball" 1
-else
-    while [ ! -f "$tarball" ] ; do
-        echo -e -n "Please insert data (floppy) disk #$diskno and press ENTER."
-        read line
-        mount /dev/fd0 -t ext2 -o ro $mountpoint
-        [ -f "$tarball" ] || umount $mountpoint ; # unmount if tarball not on disk
-        echo -en "Working..."
-    done
 fi
 

branches/2.2.5/mondo-doc/mindi.8

@@ -39 +39 @@
 .PP
 .B mindi
-creates a set of boot/root floppy disk images and/or a bootable ISO/USB image using
-files from the system it runs on.
+creates a bootable ISO/USB image using files from the system it runs on.
 .B mindi
 will try hard to reproduce the environment of its host system including loaded
@@ -48 +47 @@
 is used by
 .B monodarchive(8)
-to produce the required boot/root floppy or USB/ISO images but can also be used
-stand-alone.
+to produce the required USB/ISO images but can also be used stand-alone.
 
 For stand-alone usage,
@@ -157 +155 @@
 .I /var/cache/mindi/mindi-boot.F.img
 .B mindi
-boot floppy of size F [KB].
+boot media of size F [KB].
 .TP
 .I /var/cache/mindi/mindi-root.F.img
 .B mindi
-root floppy of size F [KB].
+root media of size F [KB].
 .TP
 .I /var/cache/mindi/mindi-data.N.img
 .B mindi
-data floppy number N for boot/root floppies.
+data media number N for boot/root media.
 .TP
 .I /var/cache/mindi/mindi.iso

branches/2.2.5/mondo-doc/mondoarchive.8

@@ -46 +46 @@
 With
 .BR \-O ,
-it backs up your filesystem to CD, tape, ISO images or NFS share. Boot floppies
+it backs up your filesystem to CD, tape, ISO images or NFS share. Boot media
 or a special boot CD will be created to allow you to restore from bare metal if
 necessary.
@@ -69 +69 @@
 To restore data, either run 
 .I mondorestore
-from the command line or boot from the emergency CD/floppies generated during
+from the command line or boot from the emergency media generated during
 the backup process. The latter will come in handy if a gremlin wipes your hard
 disk.
@@ -209 +209 @@
 .TP
 .BI "-o "
-Use LILO as boot loader of boot floppy/CD instead of SYSLINUX/ISOLINUX. By
-default, SYSLINUX is used for floppies and ISOLINUX for CD's. Use LILO if you
+Use LILO as boot loader of boot media instead of SYSLINUX/ISOLINUX. By
+default, SYSLINUX is used for USB and ISOLINUX for CD's. Use LILO if you
 prefer to use that boot loader. NB: This does not affect which boot loader you
-use to boot your PC, merely the boot loader used by the CD's/floppies created
+use to boot your PC, merely the boot loader used by the media created
 by Mondo. Use ELILO instead which is mandatory for IA64 machines.
 
@@ -249 +249 @@
 
 .TP
-.BI "-F "
-Do not offer to write boot+data floppy disk images to 3.5-inch floppy disks.
-The images will remain in /var/cache/mindi until your next backup run,
-however.
-
-.TP
 .BI "-H "
 When you boot from the tape/CD, your hard drive will be wiped and the archives

branches/2.2.5/mondo-doc/mondorescue-howto.sgml

@@ -31 +31 @@
 other supported filesystem partitions to/from CD/DVD-+R/RW media, tape,
 NFS, ... and Mindi Linux provides the bootable emergency restore
-CD/floppy set which Mondo uses at boot-time.
+media which Mondo uses at boot-time.
 </para>
 </abstract>
@@ -421 +421 @@
 </entry>
 <entry>
-Mondo calls Mindi. Mindi generates bootable floppy disk images and
+Mondo calls Mindi. Mindi generates bootable media image and
 auxiliary data disk images which are based on your existing Linux
 distribution and filesystem. That way, you can be sure Mondo's
@@ -445 +445 @@
 </entry>
 </row>
-<row>
-<entry>
-<ulink url="images/10cd.png"><inlinemediaobject><imageobject>
-<imagedata fileref="images/10cd-mini">
-</imageobject></inlinemediaobject>
-</ulink>
-</entry>
-<entry>
-Do you want to create a boot floppy at the end? Yes, if you're a
-tape or NFS user. No, if you are using CD/DVD-R[W]'s and your computer
-supports bootable CD's. Tape users only need one floppy but other
-users may need more. Mondo will advise accordingly.
-</entry>
-</row>
 </tbody></tgroup></informaltable>
 
 <itemizedlist>
 <listitem>
-<para>Try to boot from the first CD of the backup (or the first
-floppy, if you made floppies). Choose 'Compare Mode' by typing
-compare at the boot screen.</para>
+<para>Try to boot from the first media of the backup.
+Choose 'Compare Mode' by typing compare at the boot screen.
+</para>
 </listitem>
 <listitem>
@@ -471 +457 @@
 checkout the compatibility of your system. (see
 <link linkend="test-mindi">Testing Mindi</link> for more
-details). Remove the CD/floppy; boot your computer as usual;
+details). Remove the media; boot your computer as usual;
 execute as root</para>
 <para></para>
@@ -553 +539 @@
 The '-gF' means you are going to see the pretty yellow-on-blue
 screen instead of the boring white-on-black screen. :) It also
-means Mondo will not offer to create physical boot floppies for
+means Mondo will not offer to create physical boot media for
 you. It is assumed that you are able to boot from the CD which
 Mondo has generated.</para>
@@ -612 +598 @@
 If you find this to be the case for your computer, please use '-L'
 to force Mondo to use LILO instead of Syslinux as the boot loader
-for its CD/floppies. (NB: This has nothing to do with which boot
+for its media. (NB: This has nothing to do with which boot
 loader your hard drive uses.) Also, it is a good habit to specify
 your tape streamer with '-d &lt;device&gt;'. You don't usually need
@@ -691 +677 @@
 <title>Mindi</title>
 <para>
-Mindi Linux creates a set of boot/root floppy disk images
+Mindi Linux creates a set of boot/root media images
 that will let you perform basic system maintenance on your Linux
 distro. The principal virtues of Mindi's boot disks are the fact
@@ -757 +743 @@
 <listitem>
     <para>If you are not backing up to CD, please create boot
-    floppies when prompted.</para>
+    media when prompted.</para>
 </listitem>
 </itemizedlist>
@@ -766 +752 @@
 command-line options.</para>
 </listitem>
-<listitem><para>Insert the CD or the first boot floppy when prompted.
+<listitem><para>Insert the media when prompted.
                 Press &lt;Enter&gt;. Wait a moment.</para></listitem>
 <listitem><para>Select a subset of files to restore, e.g. /usr/local/man
@@ -778 +764 @@
 <itemizedlist>
 <listitem>
-<para>Boot from CD/floppies.</para>
+<para>Boot from media.</para>
 </listitem>
 <listitem><para>Select 'Interactive Mode' at boot-time. (Type
@@ -916 +902 @@
 </listitem>
 <listitem>
-<para>floppy disk support (built in)</para>
-</listitem>
-<listitem>
 <para>ext2 file system support (built-in)</para>
 </listitem>
@@ -929 +912 @@
 also</para>
 <para>vfat support in the active kernel - mindi needs this when creating
-syslinux boot floppies</para>
+syslinux boot media</para>
 </listitem>
 </itemizedlist>
@@ -940 +923 @@
 module. It does require that your kernel support the initrd
 initial ramdisk facility. Typically this is supported by the Linux
-kernel. Modules used are needed to support the CD, floppy disks,
+kernel. Modules used are needed to support the CD, 
 hard disks, etc. If the support is modular, then the modules will
 be incorporated in a boot disk by Mindi. If the support is built-in
@@ -1233 +1216 @@
 Do you want to use your own kernel to build the boot disk (y/n) ?y
 Would you like to use LILO (instead of syslinux)
-for your boot CD/floppies (y/n) ?n
+for your boot media (y/n) ?n
 Analyzing dependency requirements                               Done.
 Making complete dependency list                                 Done.
@@ -1265 +1248 @@
 Failed to copy /boot/vmlinuz-2.6.12-15mdk-i686-up-4GB to ramdisk
 
-Warning - failed to create 1.44MB boot/root floppies
-
-Warning - failed to create 1.72MB boot image. Please reduce your kernel's size
-
-if you want to make a 1.72MB floppy disk.
-
 Making 2880KB boot disk...........................mkfs.vfat 2.10 (22 Sep 2003)
 ... 2880 KB boot disks were created OK                          Done.
 In the directory '/root/images/mindi' you will find the images:-
    mindi-data-1.img    mindi-data-2.img    mindi-data-3.img    mindi-data-4.img    mindi-data-5.img mindi-root.1440.img
-Would you like to create boot+data floppy disks now (y/n) ?n
 Shall I make a bootable CD image? (y/n) y
 NB: Mindi's bootable CD always uses isolinux.
@@ -1290 +1266 @@
 
 <para>If your kernel is too large (more than about 900KB) then you
-cannot make boot floppies, although you can still make a bootable
+cannot make boot media, although you can still make a bootable
 CD image. The easiest way to test Mindi in either case is to say
 'n' to its first question and 'y' to its second, then use the
@@ -1537 +1513 @@
 isn't a good idea unless you're a Mondo expert because they'll try
 to restore over a network by default, which is silly because the
-archives are on the CD's). Or, you can boot from the Mindi floppies
+archives are on the CD's). Or, you can boot from the Mindi media
 (or mondorescue.iso) and hit ENTER a few times to restore.</para>
 <para>Those ISO images can also be used for a PXE restore. For this 
@@ -1914 +1890 @@
 </para>
 <para>If you find that you cannot make your PC boot from the CD,
-take heart: the first backup CD of each set contains floppy disk
-images to give you the same functionality as the CD (minus the
-archives, of course) on floppies. Remember, your Mondo CD is a
+take heart: the first backup media of each set contains disk
+images to give you the same functionality as this media (minus the
+archives, of course) on other boot media. Remember, your Mondo CD is a
 fully functional CD-based mini-distribution as well as a recovery
 CD.</para>
@@ -2018 +1994 @@
 <listitem>
 <para>If it did not work then please copy /tmp/mondorestore.log to
-a floppy (or to your hard disk, USB key, ...), gzip it and e-mail it to the
+to your hard disk, USB key, ..., gzip it and e-mail it to the
 &ML;.</para>
 </listitem>
@@ -2361 +2337 @@
 <para>It is now possible to restore to a live filesystem using
 Mondo. In other words, you do not have to boot your PC from your
-CD/floppy in order to restore files. Mondo was originally designed
+media in order to restore files. Mondo was originally designed
 for disaster recovery - situations in which you cannot boot your
 PC. If you can boot your PC, it is not really a disaster, is it? :)
@@ -2390 +2366 @@
 Choose your type of backup media. The live restoration process is
 very similar to what you'll experience if you type mondorestore
-with no parameters after booting from a Mondo CD/floppy.
+with no parameters after booting from a Mondo media.
 </entry>
 </row>
@@ -2404 +2380 @@
 tape backup, the tape itself should be enough. If you generated a
 CD backup, the first CD should be enough. Otherwise, you may need
-the boot floppy.
+the boot media.
 </entry>
 </row>
@@ -2663 +2639 @@
 </qandaentry>
 <qandaentry>
-<question><para>Q: Why do you insist on putting floppy
+<question><para>Q: Why do you insist on putting media
 disk images on Mondo CD? They waste space and I never use them. The
-CD works just fine, so why keep the floppy disk images?</para>
+CD works just fine, so why keep the media disk images?</para>
 </question>
 <answer>
@@ -2743 +2719 @@
 your kernel does not support these things, Mondo will not boot from
 your CD. However, when running Mindi, you may choose to use _its_
-kernel instead of your own. In addition, you may boot from floppy
-disk images instead the CD: copy the disk images from the CD
-/images directory to floppy disks, using 'dd'. Take a look at
-<link linkend="copybootdatadisk">Copy boot data
-disks</link> on how to make those.</para>
-</answer>
-</qandaentry>
-<qandaentry>
-<question><para>Q: The Mondo CD/floppy takes ages to
+kernel instead of your own.
+</para>
+</answer>
+</qandaentry>
+<qandaentry>
+<question><para>Q: The LILO Mondo media takes ages to
                 boot. How can I speed it up?</para></question>
 <answer>
@@ -2773 +2746 @@
 </qandaentry>
 <qandaentry>
-<question><para>Q: What if my PC won't boot from a
-                CD?</para></question>
-<answer>
-<para>A: Copy the image files from the CD /images directory, using
-the dd command. Take a look at
-<link linkend="copybootdatadisk">Copy boot data
-disks</link> on how to make those. Then boot from the first
-floppy; follow it up with the data disks; finally, type 'mount
-/mnt/cdrom' and then utilize the restore script as usual, e.g.
-mondorestore.</para>
-<para>A: You may also want to boot using the network with PXE. 
-        Look at the README.pxe file of mindi to know more details on how.</para>
-</answer>
-</qandaentry>
-<qandaentry>
-<question><para>Q: But why won't Mondo boot from my CD?
+<question><para>Q: Why won't Mondo boot from my CD?
 It says my kernel is flawed/outdated/ whatever, and when I wrote to
 the ML, they told me the same thing... but I still don't get it. I
@@ -2808 +2766 @@
 aside for a large tarball containing the data disks, a list of all
 files backed up, and other sundries. If Mondo and Mindi do their
-respective jobs then you won't need additional floppies, just the
-boot floppy and the tape(s).</para>
+respective jobs then you won't need additional media, just the
+boot media and the tape(s).</para>
 <para>For the moment mondorescue doesn't support OBDR for tapes. 
         Feel free to produce patches for it :-)</para>
@@ -2837 +2795 @@
 at <link linkend="overview-sysrq-kernelreq">Linux Kernel support</link> to
 see what your kernel must support.</para>
-</answer>
-</qandaentry>
-<qandaentry>
-<question>
-<para id="copybootdatadisk">Q: How do i copy boot+data disk images to physical floppy disks ?</para>
-</question>
-<answer>
-<para>A: The images are in /root/images/mindi (even if they are
-created by Mondo) and also in the 'images' directory on the first
-CD of your backup set, if you have backed up to CD. You can copy
-the images to disk as follows:-</para>
-<informaltable><tgroup cols="1"><tbody>
-<row>
-<entry>
-        Put an empty Boot floppy
-</entry>
-</row>
-<row>
-<entry>
-        bash# fdformat /dev/fd0u1722
-</entry>
-</row>
-<row>
-<entry>
-        bash# dd if=/root/images/mindi/mindi-boot.1722.img of=/dev/fd0u1722
-</entry>
-</row>
-<row>
-<entry>
-        Put an empty Data floppy
-</entry>
-</row>
-<row>
-<entry>
-        bash# fdformat /dev/fd0
-</entry>
-</row>
-<row>
-<entry>
-        bash# dd if=/root/images/mindi/mindi-data-N.img of=/dev/fd0
-</entry>
-</row>
-<row>
-<entry>
-        Replace N with 1, 2, etc.
-
-</entry>
-</row>
-</tbody></tgroup></informaltable>
 </answer>
 </qandaentry>
@@ -3013 +2922 @@
 </qandaentry>
 <qandaentry>
-<question><para>Q: How do I copy the floppy images from
-                the CD to floppy disks?</para></question>
-<answer>
-<para>A: Mount the CD-ROM, e.g. at /mnt/cdrom. Insert a blank
-floppy. Type:</para>
-<para></para>
-<informaltable><tgroup cols="1"><tbody>
-<row>
-<entry>
-
-        bash# cd /mnt/cdrom/images
-</entry>
-</row>
-<row>
-<entry>
-        bash# dd if=mindi-boot.1722.img of=/dev/fd0u1722
-
-</entry>
-</row>
-</tbody></tgroup></informaltable>
-
-<para>Insert another blank floppy and type:</para>
-<para></para>
-<informaltable><tgroup cols="1"><tbody>
-<row>
-<entry>
-
-bash# dd if=mindi-data-1.img of=/dev/fd0u1722
-
-</entry>
-</row>
-</tbody></tgroup></informaltable>
-
-<para>Do the above for each 'mindi-data' disk image.</para>
-</answer>
-</qandaentry>
-<qandaentry>
 <question><para>Q: Sometimes, my laptop won't mount
                 Mondo CD properly, or something. Umm...</para></question>
@@ -3213 +3085 @@
 <para>A: Yes. Just backup as usual but add '-d /mnt/nfs' or
 wherever your partition is mounted; don't use '-Oc' or '-Ot' at
-all; just '-Oi -d /root'. Then, after booting from the floppies
+all; just '-Oi -d /root'. Then, after booting from the media
 which Mondo generates, you need to type 'ISO' at the
 console.</para>
@@ -3314 +3186 @@
 <qandaentry>
 <question><para id="SEGF">Q: When I restore after
-booting from the CD/floppies, I sometimes get errors like, "Running
+booting from the media, I sometimes get errors like, "Running
 out of memory" or "Segmentation fault". What is going on?</para></question>
 <answer><para>A: It sounds as if you are running out of disk

branches/2.2.5/mondo/distributions/conf/mondorescue.conf

@@ -92 +92 @@
 
 #
-# Write boot floppies (yes|no) ?
-#
-write_boot_floppy=no
-
-#
 # Write mindi CD (yes|no) ?
 #

branches/2.2.5/mondo/src/common/libmondo-archive-EXT.h

@@ -22 +22 @@
 extern int _move_files_to_stream(
                                  char *files_to_add, ...);
-extern int offer_to_write_boot_floppies_to_physical_disks();
 extern void pause_and_ask_for_cdr(int, bool *);
 extern int slice_up_file_etc(

branches/2.2.5/mondo/src/common/libmondo-archive.c

@@ -195 +195 @@
 
 
-/** @def DEFAULT_1722MB_DISK The default 1.722M floppy disk to write images to. */
-/** @def BACKUP_1722MB_DISK  The 1.722M floppy disk to try if the default fails. */
-
-#ifdef __FreeBSD__
-#define DEFAULT_1722MB_DISK "/dev/fd0.1722"
-#define BACKUP_1722MB_DISK "/dev/fd0.1722"
-#else
-#define DEFAULT_1722MB_DISK "/dev/fd0u1722"
-#define BACKUP_1722MB_DISK "/dev/fd0H1722"
 #ifndef _SEMUN_H
 #define _SEMUN_H
@@ -1032 +1023 @@
         log_OS_error("Unable to make images directory");
     }
-    sprintf(command, "mkdir -p %s%s", bkpinfo->scratchdir, MNT_FLOPPY);
-    if (system(command)) {
-        res++;
-        log_OS_error("Unable to make mnt floppy directory");
-    }
     sprintf(tmp, "BTW, I'm telling Mindi your kernel is '%s'",
             bkpinfo->kernel_path);
@@ -1456 +1442 @@
 }
 
-
-/**
- * Calls floppy-formatting @c cmd and tracks its progress if possible.
- *
- * @param cmd The command to run (e.g. @c fdformat @c /dev/fd0).
- * @param title The human-friendly description of the floppy you are writing.
- * This will be used as the title in the progress bar window. Example:
- * "Formatting disk /dev/fd0".
- * @see format_disk
- * @return The exit code of fdformat/superformat.
- */
-int format_disk_SUB(char *cmd, char *title)
-{
-
-    /*@ int *************************************************************** */
-    int res = 0;
-    int percentage = 0;
-    int maxtracks = 0;
-    int trackno = 0;
-    int last_trkno = 0;
-
-    /*@ buffers *********************************************************** */
-    char *command;
-    char *tempfile;
-
-    /*@ pointers ********************************************************** */
-    FILE *pin;
-
-    assert_string_is_neither_NULL_nor_zerolength(cmd);
-    assert_string_is_neither_NULL_nor_zerolength(title);
-
-    malloc_string(command);
-    malloc_string(tempfile);
-#ifdef __FreeBSD__
-/* Ugh. FreeBSD fdformat prints out this pretty progress indicator that's
-   impossible to parse. It looks like
-   VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVF-------------------
-   where V means verified, E means error, F means formatted, and - means
-   not done yet.
-*/
-    return (run_program_and_log_to_screen(cmd, title));
-#endif
-
-/* if Debian then do bog-standard superformat; don't be pretty */
-    if (strstr(cmd, "superformat")) {
-        return (run_program_and_log_to_screen(cmd, title));
-    }
-/* if not Debian then go ahead & use fdformat */
-    sprintf(tempfile, "%s/mondo.floppy.log", bkpinfo->tmpdir);
-    sprintf(command, "%s >> %s 2>> %s; rm -f %s", cmd, tempfile, tempfile,
-            tempfile);
-    log_msg(3, command);
-    open_evalcall_form(title);
-    if (!(pin = popen(command, "r"))) {
-        log_OS_error("fmt err");
-        return (1);
-    }
-    if (strstr(command, "1722")) {
-        maxtracks = 82;
-    } else {
-        maxtracks = 80;
-    }
-    for (sleep(1); does_file_exist(tempfile); sleep(1)) {
-        trackno = get_trackno_from_logfile(tempfile);
-        if (trackno < 0 || trackno > 80) {
-            log_msg(1, "Weird track#");
-            continue;
-        }
-        percentage = trackno * 100 / maxtracks;
-        if (trackno <= 5 && last_trkno > 40) {
-            close_evalcall_form();
-            strcpy(title, "Verifying format");
-            open_evalcall_form(title);
-        }
-        last_trkno = trackno;
-        update_evalcall_form(percentage);
-    }
-    close_evalcall_form();
-    if (pclose(pin)) {
-        res++;
-        log_OS_error("Unable to pclose");
-    }
-    unlink(tempfile);
-    paranoid_free(command);
-    paranoid_free(tempfile);
-    return (res);
-}
-
-/**
- * Wrapper around @c format_disk_SUB().
- * This function calls @c format_disk_SUB() with a @c device of its @c device
- * parameter and a @c title of Formatting disk @c device. If the format
- * fails, the user will be given the option of retrying.
- *
- * @param device The floppy drive to write to.
- * @see format_disk_SUB
- * @return The exit code of fdformat/superformat.
- * @ingroup deviceGroup
- */
-int format_disk(char *device)
-{
-
-    /*@ int ************************************************************** */
-    int res = 0;
-
-    /*@ buffer *********************************************************** */
-    char *command;
-    char *title;
-
-
-    assert_string_is_neither_NULL_nor_zerolength(device);
-    malloc_string(title);
-    command = malloc(1000);
-    if (!system("which superformat > /dev/null 2> /dev/null")) {
-        sprintf(command, "superformat %s", device);
-    } else {
-#ifdef __FreeBSD__
-        sprintf(command, "fdformat -y %s", device);
-#else
-        sprintf(command, "fdformat %s", device);
-#endif
-    }
-    sprintf(title, "Formatting disk %s", device);
-    while ((res = format_disk_SUB(command, title))) {
-        if (!ask_me_yes_or_no("Failed to format disk. Retry?")) {
-            return (res);
-        }
-    }
-    paranoid_free(title);
-    paranoid_free(command);
-    return (res);
-}
 
 /**
@@ -2879 +2733 @@
 
 
-
-
-
-
-/**
- * Offer to write boot and data disk images to 3.5" floppy disks.
- * @param bkpinfo The backup information structure. Only the
- * @c backup_media_type field is used in this function.
- * @param imagesdir The directory containing the floppy images (usually
- * /root/images/mindi).
- *
- * @return The number of errors encountered (0 for success)
- * @see write_image_to_floppy
- * @see format_disk
- * @ingroup MLarchiveGroup
- */
-int offer_to_write_floppies(char *imagesdir)
-{
-    /*@ buffer ************************************************************ */
-    char *tmp;
-    char *comment;
-    char *bootdisk_dev;
-    char *datadisk_dev;
-    char *bootdisk_file;
-    char *rootdisk_file;
-
-    /*@ int *************************************************************** */
-    int i = 0;
-    int res = 0;
-
-    /*@ bool ************************************************************** */
-    bool format_first;
-    bool root_disk_exists = FALSE;
-
-    malloc_string(tmp);
-    malloc_string(comment);
-    malloc_string(bootdisk_dev);
-    malloc_string(datadisk_dev);
-    malloc_string(rootdisk_file);
-    malloc_string(bootdisk_file);
-    assert(bkpinfo != NULL);
-    assert_string_is_neither_NULL_nor_zerolength(imagesdir);
-
-
-    if (!ask_me_yes_or_no
-        ("Write boot and data disk images to 3.5\" floppy disks?")) {
-        return (0);
-    }
-    if (does_device_exist(DEFAULT_1722MB_DISK)) {
-#ifdef __FreeBSD__
-        // tell the system that this is a 1.72m floppy
-        system("/usr/sbin/fdcontrol -F 1722 /dev/fd0.1722");
-#endif
-        strcpy(bootdisk_dev, DEFAULT_1722MB_DISK);
-    } else if (does_device_exist(BACKUP_1722MB_DISK)) {
-        sprintf(bootdisk_dev, "/dev/fd0H1722");
-    } else {
-        log_msg(1, "Warning - can't find a 1.72MB floppy device *sigh*");
-        strcpy(bootdisk_dev, DEFAULT_1722MB_DISK);
-//      return (1);
-    }
-    strcpy(datadisk_dev, "/dev/fd0");
-    if (!does_device_exist(datadisk_dev)) {
-        log_msg(1, "Warning - can't find a 1.44MB floppy device *sigh*");
-        strcpy(datadisk_dev, "/dev/fd0");
-//      return (1);
-    }
-    format_first =
-        ask_me_yes_or_no
-        ("Do you want me to format the disks before I write to them?");
-
-/* boot disk */
-    if (ask_me_OK_or_cancel("About to write boot disk")) {
-        log_to_screen("Writing boot floppy");
-#ifdef __FreeBSD__
-        sprintf(tmp, "%s/mindi-kern.1722.img", imagesdir);
-        if (format_first) {
-            format_disk(bootdisk_dev);
-        }
-        res += write_image_to_floppy(bootdisk_dev, tmp);
-        if (ask_me_OK_or_cancel("About to write 1.44MB mfsroot disk")) {
-            log_to_screen("Writing mfsroot floppy");
-            if (format_first) {
-                format_disk(datadisk_dev);
-            }
-            sprintf(tmp, "%s/mindi-mfsroot.1440.img", imagesdir);
-            write_image_to_floppy(datadisk_dev, tmp);
-        }
-#else
-        sprintf(bootdisk_file, "%s/mindi-bootroot.1722.img", imagesdir);
-        if (does_file_exist(bootdisk_file)) {
-            if (format_first) {
-                format_disk(bootdisk_dev);
-            }
-            res += write_image_to_floppy(bootdisk_dev, bootdisk_file);
-        } else {
-            sprintf(bootdisk_file, "%s/mindi-boot.1440.img", imagesdir);
-            sprintf(rootdisk_file, "%s/mindi-root.1440.img", imagesdir);
-            root_disk_exists = TRUE;
-            if (!does_file_exist(rootdisk_file)
-                || !does_file_exist(bootdisk_file)) {
-                popup_and_OK
-                    ("Cannot write boot/root floppies. Files not found.");
-                log_to_screen
-                    ("Failed to find boot/root floppy images. Oh dear.");
-                return (1);
-            }
-            if (format_first) {
-                format_disk(datadisk_dev);
-            }
-            /*
-               sprintf(tmp, "cat %s > %s", bootdisk_file, datadisk_dev);
-               res += run_external_binary_with_percentage_indicator_NEW("Writing boot floppy", tmp);
-             */
-            res += write_image_to_floppy(datadisk_dev, bootdisk_file);
-            if (ask_me_OK_or_cancel("About to write root disk")) {
-                log_to_screen("Writing root floppy");
-                if (format_first) {
-                    format_disk(datadisk_dev);
-                }
-                sprintf(tmp, "cat %s > %s", rootdisk_file, datadisk_dev);
-                log_msg(1, "tmp = '%s'", tmp);
-                res +=
-                    run_external_binary_with_percentage_indicator_NEW
-                    ("Writing root floppy", tmp);
-//              res += write_image_to_floppy (datadisk_dev, rootdisk_file);
-            }
-        }
-#endif
-    }
-    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        log_to_screen
-            ("FYI, the data disks are stored on tape/CD for your convenience.");
-        return (0);
-    }
-    for (i = 1; i < 99; i++) {
-        sprintf(tmp, "%s/mindi-data-%d.img", imagesdir, i);
-        log_msg(3, tmp);
-        if (!does_file_exist(tmp)) {
-            log_msg(3, "...not found");
-            break;
-        }
-        sprintf(comment, "About to write data disk #%d", i);
-        if (ask_me_OK_or_cancel(comment)) {
-            sprintf(comment, "Writing data disk #%3d", i);
-            log_to_screen(comment);
-            if (format_first) {
-                res += format_disk(datadisk_dev);
-            }
-            res += write_image_to_floppy(datadisk_dev, tmp);
-        }
-    }
-    paranoid_free(tmp);
-    paranoid_free(comment);
-    paranoid_free(bootdisk_dev);
-    paranoid_free(datadisk_dev);
-    return (res);
-}
-
-
-
-
-
-
-
-
-/**
- * Wrapper around @c offer_to_write_floppies().
- * @param bkpinfo The backup information structure. Used only
- * in the call to @c offer_to_write_floppies().
- * @return 0 if the boot floppies were found (not necessarily written OK),
- * 1 otherwise.
- * @see offer_to_write_floppies
- * @ingroup MLarchiveGroup
- */
-
-int offer_to_write_boot_floppies_to_physical_disks()
-{
-    int res = 0;
-
-    assert(bkpinfo != NULL);
-
-    mvaddstr_and_log_it(g_currentY, 0,
-                        "Writing boot+data floppy images to disk");
-
-    if (!bkpinfo->nonbootable_backup) {
-#ifdef __FreeBSD__
-        if (!does_file_exist(MINDI_CACHE"/mindi-kern.1722.img"))
-#else
-        if (!does_file_exist(MINDI_CACHE"/mindi-bootroot.1722.img") && !does_file_exist(MINDI_CACHE"/mindi-boot.1440.img"))
-#endif
-        {
-            mvaddstr_and_log_it(g_currentY++, 74, "No Imgs");
-            if (does_file_exist(MINDI_CACHE"/mondorescue.iso")) {
-                popup_and_OK
-                    ("No regular Boot+data floppies were created due of space constraints. However, you can burn "MINDI_CACHE"/mondorescue.iso to a CD and boot from that.");
-                res++;
-            }
-        } else {
-            offer_to_write_floppies(MINDI_CACHE);
-            mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-        }
-    } else {
-        popup_and_OK
-            ("Since you opted for a nonbootable backup, no boot floppies were created.");
-    }
-
-    return (res);
-}
-
-
-
-
 /**
  * @addtogroup LLarchiveGroup
@@ -4107 +3748 @@
 
 
-
-
-
-/**
- * @addtogroup utilityGroup
- * @{
- */
-/**
- * Write an image to a real 3.5" floppy disk.
- * @param device The device to write to (e.g. @c /dev/fd0)
- * @param datafile The image to write to @p device.
- * @return The number of errors encountered (0 for success)
- * @see write_image_to_floppy
- */
-int write_image_to_floppy_SUB(char *device, char *datafile)
-{
-    /*@ int *************************************************************** */
-    int res = 0;
-    int percentage = 0;
-    int blockno = 0;
-    int maxblocks = 0;
-
-    /*@ buffers************************************************************ */
-    char *tmp;
-    char blk[1024];
-    char *title;
-
-    /*@ pointers ********************************************************** */
-    char *p;
-    FILE *fout, *fin;
-
-
-    malloc_string(tmp);
-    malloc_string(title);
-    /* pretty stuff */
-    if (!(p = strrchr(datafile, '/'))) {
-        p = datafile;
-    } else {
-        p++;
-    }
-    sprintf(title, "Writing %s to floppy", p);
-    open_evalcall_form(title);
-    /* functional stuff */
-    for (p = device + strlen(device); p != device && isdigit(*(p - 1));
-         p--);
-    maxblocks = atoi(p);
-    if (!maxblocks) {
-        maxblocks = 1440;
-    }
-    sprintf(tmp, "maxblocks = %d; p=%s", maxblocks, p);
-    log_msg(2, tmp);
-    /* copy data from image to floppy */
-    if (!(fin = fopen(datafile, "r"))) {
-        log_OS_error("Cannot open img");
-        return (1);
-    }
-    if (!(fout = fopen(device, "w"))) {
-        log_OS_error("Cannot open fdd");
-        return (1);
-    }
-    for (blockno = 0; blockno < maxblocks; blockno++) {
-        percentage = blockno * 100 / maxblocks;
-        if (fread(blk, 1, 1024, fin) != 1024) {
-            if (feof(fin)) {
-                log_msg(1,
-                        "img read err - img ended prematurely - non-fatal error");
-                sleep(3);
-                return (res);
-            }
-            res++;
-            log_to_screen("img read err");
-        }
-        if (fwrite(blk, 1, 1024, fout) != 1024) {
-            res++;
-            log_to_screen("fdd write err");
-        }
-        if (((blockno + 1) % 128) == 0) {
-            paranoid_system("sync");    /* fflush doesn't work; dunno why */
-            update_evalcall_form(percentage);
-        }
-    }
-    paranoid_fclose(fin);
-    paranoid_fclose(fout);
-    paranoid_free(tmp);
-    paranoid_free(title);
-    close_evalcall_form();
-    return (res);
-}
-
-
-
-
-
-
-
-
-
-/**
- * Wrapper around @c write_image_to_floppy_SUB().
- * This function, unlike @c write_image_to_floppy_SUB(),
- * gives the user the opportunity to retry if the write fails.
- * @see write_image_to_floppy_SUB
- */
-int write_image_to_floppy(char *device, char *datafile)
-{
-    /*@ int ************************************************************** */
-    int res = 0;
-
-    assert_string_is_neither_NULL_nor_zerolength(device);
-    assert_string_is_neither_NULL_nor_zerolength(datafile);
-
-    while ((res = write_image_to_floppy_SUB(device, datafile))) {
-        if (!ask_me_yes_or_no("Failed to write image to floppy. Retry?")) {
-            return (res);
-        }
-    }
-    return (res);
-}
-
-/* @} - end of utilityGroup */
-
 void setenv_mondo_share(void) {
 

branches/2.2.5/mondo/src/common/libmondo-archive.h

@@ -24 +24 @@
 int _move_files_to_stream(char *files_to_add,
                           ...);
-int offer_to_write_boot_floppies_to_physical_disks();
 void pause_and_ask_for_cdr(int, bool *);
 void set_bit_N_of_array(char *array, int N, bool true_or_false);
@@ -33 +32 @@
 int verify_data();
 void wipe_archives(char *d);
-int write_image_to_floppy(char *device, char *datafile);
-int write_image_to_floppy_SUB(char *device, char *datafile);
 int write_iso_and_go_on(bool last_cd);
 int write_final_iso_if_necessary();

branches/2.2.5/mondo/src/common/libmondo-devices.c

@@ -1890 +1890 @@
     }
     if (bkpinfo->backup_media_type == tape && bkpinfo->restore_data) {
-        popup_and_OK("Please remove CD/floppy from drive(s)");
+        popup_and_OK("Please remove media from drive(s)");
     }
     log_msg(3, "media type = %s",

branches/2.2.5/mondo/src/common/my-stuff.h

@@ -232 +232 @@
 #define MONDO_CFG_FILE_STUB "tmp/mondo-restore.cfg"
 /**
- * The location where mindi CD and floppy images are stored.
+ * The location where mindi media images are stored.
  */
 #define MINDI_CACHE "/var/cache/mindi"

branches/2.2.5/mondo/src/mondoarchive/main.c

@@ -484 +484 @@
     }
 
-/* Offer to write floppy disk images to physical disks */
-    if (bkpinfo->backup_data && !g_skip_floppies) {
-        res = offer_to_write_boot_floppies_to_physical_disks();
-        retval += res;
-//      res = offer_to_write_boot_ISO_to_physical_CD();
-//      retval += res;
-    }
-
 /* Report result of entire operation (success? errors?) */
     if (!retval) {

branches/2.2.5/mondo/src/mondoarchive/mondo-cli.c

@@ -969 +969 @@
                 ("Your kernel appears not to support vfat filesystems. I am therefore");
             log_to_screen
-                ("using LILO instead of SYSLINUX as the CD/floppy's boot loader.");
+                ("using LILO instead of SYSLINUX as the media boot loader.");
         }
         if (run_program_and_log_output("which mkfs.vfat", 2)) {

branches/2.2.5/mondo/src/mondorestore/mondo-restore.c

@@ -141 +141 @@
  * The message to display if we detect that the user is using a Compaq Proliant.
  */
-#define COMPAQ_PROLIANTS_SUCK "Partition and format your disk using Compaq's disaster recovery CD. After you've done that, please reboot with your Mondo CD/floppy in Interactive Mode."
+#define COMPAQ_PROLIANTS_SUCK "Partition and format your disk using Compaq's disaster recovery CD. After you've done that, please reboot with your Mondo media in Interactive Mode."
 
 
@@ -928 +928 @@
     if (!g_restoring_live_from_cd) {
         popup_and_OK
-            ("Please insert tape/CD/USB Key/boot floppy, then hit 'OK' to continue.");
+            ("Please insert tape/CD/USB Key, then hit 'OK' to continue.");
         sleep(1);
     }
@@ -2937 +2937 @@
 
     run_program_and_log_output("mkdir -p " MNT_CDROM, FALSE);
-    run_program_and_log_output("mkdir -p /mnt/floppy", FALSE);
 
     malloc_string(tmp);
@@ -3274 +3273 @@
             mvaddstr_and_log_it(g_currentY++,
                                 0,
-                                "Run complete. Please remove floppy/CD/media and reboot.");
+                                "Run complete. Please remove media and reboot.");
         } else {
             run_program_and_log_output("sync", FALSE);

branches/2.2.5/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -2313 +2313 @@
     int res = 0;
     int fd = 0;
-    struct floppy_struct fdprms;
 
     bool try_plan_B;
@@ -2348 +2347 @@
     log_msg(2, "mountpt = %s; cfg_file=%s", mountpt, cfg_file);
 
-    /* Floppy? */
-    sprintf(tmp, "mkdir -p %s", mountpt);
-    run_program_and_log_output(tmp, FALSE);
-    sprintf(tmp, "mkdir -p %s/tmp", bkpinfo->tmpdir);
-    run_program_and_log_output(tmp, FALSE);
-
-    /* Is there a floppy drive detected */
-    fd = open("/dev/fd0u1722", O_RDONLY);
-    if (fd > 0) {
-        // open OK
-        res = ioctl(fd, FDGETPRM, &fdprms);
-        if (res >= 0) {
-            // media OK to mount 
-            sprintf(command, "mount /dev/fd0u1722 %s", mountpt);
-            res = run_program_and_log_output(command, FALSE);
-        } else {
-            //skip mount 
-            res = 1;
-        } 
-    } else { 
-        fd = open("/dev/fd0H1440", O_RDONLY);
-        if (fd > 0) {
-            // open OK
-            res = ioctl(fd, FDGETPRM, &fdprms);
-            if (res >= 0) {
-                // media OK to mount 
-                sprintf(command, "mount /dev/fd0H1440 %s", mountpt);
-                res = run_program_and_log_output(command, FALSE);
-            } else {
-                //skip mount 
-                res = 1;
-            } 
-        }
-    }
-    if (res) {
-        try_plan_B = TRUE;
-    } else {
-        try_plan_B = TRUE;
-        log_msg(2,
-                "Mounted floppy OK but I don't trust it because the archives might contain more up-to-date config file than the floppy does.");
-        // NB: If busybox does not support 'mount -o loop' then Plan A WILL NOT WORK.
-        log_msg(2, "Processing floppy (plan A?)");
-        sprintf(ramdisk_fname, "%s/mindi.rdz", mountpt);
-        if (!does_file_exist(ramdisk_fname)) {
-            sprintf(ramdisk_fname, "%s/initrd.img", mountpt);
-        }
-        if (!does_file_exist(ramdisk_fname)) {
-            log_msg(2,
-                    "Cannot find ramdisk file on mountpoint. Are you sure that's a boot disk in the drive?");
-        }
-        if (extract_config_file_from_ramdisk(ramdisk_fname, cfg_file, mountlist_file)) {
-            log_msg(2,
-                    "Warning - failed to extract config file from ramdisk. I think this boot disk is mangled.");
-        }
-        sprintf(command, "umount %s", mountpt);
-        run_program_and_log_output(command, 5);
-        unlink(ramdisk_fname);
-    }
     if (!does_file_exist(cfg_file)) {
         log_msg(2, "gcffa --- we don't have cfg file yet.");
@@ -2453 +2394 @@
 
             if (!does_file_exist("tmp/mondo-restore.cfg")) {
-                log_to_screen("Cannot find config info on tape/CD/floppy");
+                log_to_screen("Cannot find config info on media");
                 return (1);
             }

branches/2.2.5/pbconf/mondo-doc/du/mondo-doc.doc-base

@@ -6 +6 @@
  effortlessly backup and interactively restore Linux, Windows and other
  supported filesystem partitions to/from CD-R/RW media, tape, NFS, ... and
- Mindi Linux provides the bootable emergency restore CD/floppy set which Mondo
+ Mindi Linux provides the bootable emergency restore media set which Mondo
  uses at boot-time.
 Section: PBGRP