Changeset 1885 in MondoRescue for branches/2.2.5/mindi/rootfs/sbin

Timestamp:

Mar 2, 2008, 12:38:35 AM (16 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/mindi/rootfs/sbin

Files:

• bug-me (deleted)
• find-and-mount-cdrom (modified) (1 diff)
• init (modified) (7 diffs)
• untar (modified) (2 diffs)

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