Changeset 1581 in MondoRescue for branches/stable/mindi/rootfs/sbin

Timestamp:

Jul 27, 2007, 2:11:55 AM (18 years ago)

Author:

Bruno Cornec

Message:

Continue to remove floppy support

Location:

branches/stable/mindi/rootfs/sbin

Files:

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

branches/stable/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
-
-
-
-

branches/stable/mindi/rootfs/sbin/init

@@ -123 +123 @@
         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 CD." 1
         echo -en "---> "
         read tapedev
@@ -138 +138 @@
 
     if [ "$res" -ne "0" ] ; then
-    cd /
-    LogIt "Failed to use tape as extended datadisk. Reverting to floppies." 1
-    HandleCDROMorFloppies
-    res=$?
+        cd /
+        LogIt "Failed to use tape as extended datadisk. Reverting to cd." 1
+        HandleCDROM
+        res=$?
     else
-#   clear
-    LogIt "Using tape as extended datadisk. Good." 3
-    echo "Using tape as extd ddisk." > /tmp/TAPEDEV-HAS-DATA-DISKS
-    res=0
+    #   clear
+        LogIt "Using tape as extended datadisk. Good." 3
+        echo "Using tape as extd ddisk." > /tmp/TAPEDEV-HAS-DATA-DISKS
+        res=0
         CD_MOUNTED_OK=yes
     fi
@@ -154 +154 @@
 
 
-HandleCDROMorFloppies() {
+HHandleCDROM() {
     find-and-mount-cdrom
     res=$?
@@ -167 +167 @@
         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 "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 /var/cache/mindi" 3
-        LogIt "on your hard disk. Your archives are probably fine but" 3
+        LogIt "OK, I am unable to go on. You seem to be missing a driver" 3
+        LogIt "Your archives are probably fine but" 3
         LogIt "your tape streamer and/or CD-ROM drive are eccentric. :-)" 3
         CD_MOUNTED_OK=""
@@ -479 +472 @@
     ExtractDataDisksAndLoadModules
 else
-    HandleCDROMorFloppies
+    HandleCDROM
     ExtractDataDisksAndLoadModules
     # We need to get here exported variables from start-nfs
@@ -563 +556 @@
 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
 echo -en "Type 'exit' to reboot the PC\n"

branches/stable/mindi/rootfs/sbin/untar-and-softlink

@@ -14 +14 @@
 # ---------------------- main ----------------------
 
-mountpoint=/mnt/floppy
+mountpoint=""
 [ -e "/tmp/CDROM-LIVES-HERE" ] && mountpoint=/mnt/cdrom/images
 [ "$#" -eq "3" ] || Die "untar-and-softlink <tarball> <untar_to> <softlink_to>"
@@ -23 +23 @@
 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