Changeset 1977 in MondoRescue for branches/stable/mindi/mindi

Timestamp:

Jun 2, 2008, 10:49:01 AM (16 years ago)

Author:

Bruno Cornec

Message:

svn merge -r 1938:1976 $SVN_M/branches/2.2.6

File:

• branches/stable/mindi/mindi (modified) (6 diffs)

branches/stable/mindi/mindi

@@ -1385 +1385 @@
     rm -Rf $MINDI_TMP/iso
     mkdir -p $MINDI_TMP/iso/{images,archives,isolinux}
-    cp -f $1/*.img $1/*.gz $MINDI_TMP/iso/images 2>> $LOGFILE || LogIt "OfferToMakeBootableISO: Cannot copy $i to $MINDI_TMP/iso/images"
+    cp -f $1/*.gz $MINDI_TMP/iso/images 2>> $LOGFILE || LogIt "OfferToMakeBootableISO: Cannot copy $1/*.gz to $MINDI_TMP/iso/images"
     old_pwd=`pwd`
     cd $MINDI_TMP/iso
@@ -1427 +1427 @@
     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
+        rm -f images/mindi-bootroot.$BOOT_SIZE.img
     fi
     if [ "$?" -ne "0" ] ; then
@@ -1630 +1631 @@
             else
                 options="interactive expert compare iso nuke isonuke"
-# hda hdb hdc hdd"
             fi
         else
@@ -2100 +2100 @@
     rm -f $orig_file
     return 0
-}
-
-
-ScanCDandTape() {
-    local i
-
-    for i in /dev/st0 /dev/ht0 /dev/cdrom /dev/cdrom0 /dev/cdrom 1 ; do
-        dd if=$i of=/dev/null bs=64k count=1 &> /dev/null
-    done
 }
 
@@ -2880 +2871 @@
     fi
 fi
-#ScanCDandTape
 [ "$CDRECOVERY" = "yes" ] || CDRECOVERY=no
 if [ "$CDRECOVERY" = "yes" ] ; then
@@ -2956 +2946 @@
 fi
 if [ _"$MONDO_SHARE" = _"" ] && [ "$INTERACTIVE" = "yes" ] && [ "$ARCH" != "ia64" ] ; then
-    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
-        USE_LILO=no
-    else
-        USE_LILO=yes
-    fi
+    USE_LILO=no
 fi
 if [ "$YOUR_KERNEL_SUCKS" != "" ] || [ "$kernelpath" = "" ] || [ "$kernelpath" = "SUCKS" ] || [ "$kernelpath" = "FAILSAFE" ] ; then