Changeset 1087 in MondoRescue for branches/stable/mindi/rootfs/sbin/find-and-mount-cdrom

Timestamp:

Feb 2, 2007, 11:31:00 PM (17 years ago)

Author:

Bruno Cornec

Message:

WARNING: Not tested yet ! Will be stabilized in next hours.
this patch changes the interface between mindi and mondo.
Everything is now managed through either MONDO_CACHE/mondo-restore.cfg
and MONDO_CACHE/mindi.conf (an additional configuration file)
This removes all the one line files NFS-*, ... that where used
in an anarchic way. Now everything computed by mondo is
under mondo-restore.cfg and everything related to mindi in mindi.conf

Still needed are the removal of the 2 parameters to mindi,
but that will be done after when a clear line is drawn between
where files are put by each tool.

MONDO_TMP and MINDI_TMP should be reserved for temporary files
MONDO_CACHE and MINDI_CACHE for end results and communication
between tools.
These changes were made in order to prepare the USB support in mondo

A first step in the right direction, but still some work to do
before it's working again.
Testers please be warned.

File:

• branches/stable/mindi/rootfs/sbin/find-and-mount-cdrom (modified) (1 diff)

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

@@ -8 +8 @@
         [ ! "$SECOND_TRY" ] && LogIt "Trying $device"
         if [ "`grep "using-cdstream yes" /tmp/mondo-restore.cfg`" ]; then
-        pwd=`pwd`
-        cd $GROOVY
+            pwd=`pwd`
+            cd $GROOVY
             tar -zxf $device 2> /tmp/mount.log
             res=$?
-        cd $pwd
+            cd $pwd
             if [ "$res" -eq "0" ] ; then
-        clear
-               LogIt "Using cdstream as extended datadisk ($device). Good." 3
-        echo "Using cdstrea as extd dsk." > /tmp/TAPEDEV-HAS-DATA-DISKS
-                ln -sf $device /dev/cdrom
-                exit 0
-        fi
+                clear
+                LogIt "Using cdstream as extended datadisk ($device). Good." 3
+                echo "Using cdstream as extd dsk." > /tmp/TAPEDEV-HAS-DATA-DISKS
+                ln -sf $device /dev/cdrom
+                exit 0
+            fi
         else
             mount $device -t iso9660 -o ro /mnt/cdrom 2> /tmp/mount.log
-        res=$?
+            res=$?
         fi
-    if [ "$res" -ne "0" ] ; then
-        res=`cat /tmp/mount.log`
-        if [ "$res" = "mount: No medium found" ] ; then
+        if [ "$res" -ne "0" ] ; then
+            res=`cat /tmp/mount.log`
+            if [ "$res" = "mount: No medium found" ] ; then
                [ ! "$SECOND_TRY" ] && LogIt "There is a CD-ROM drive at $device but no CD in it."
-        else
+            else
                [ ! "$SECOND_TRY" ] && LogIt "It's not in $device; I'll keep looking"
-        fi
-        continue
+            fi
+            continue
     fi
     LogIt "$device has a CD-ROM in it"