Changeset 1950 in MondoRescue

Timestamp:

May 26, 2008, 6:39:48 PM (17 years ago)

Author:

Bruno Cornec

Message:

• Do not propose to use ILLO in mindi standalone
• Remove temporary .img files at the end of mindi
• Push the iso image on the tape the right way

Location:

branches/2.2.6

Files:

• mindi/mindi (modified) (3 diffs)
• mondo/src/common/libmondo-stream.c (modified) (1 diff)

branches/2.2.6/mindi/mindi

@@ -1427 +1427 @@
     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
@@ -1469 +1469 @@
     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
@@ -2968 +2969 @@
 fi
 if [ _"$MONDO_SHARE" = _"" ] && [ "$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

branches/2.2.6/mondo/src/common/libmondo-stream.c

@@ -683 +683 @@
     paranoid_free(command);
 
-    asprintf(&command, "dd if=%s of=%s bs=2048", ntapedev, MINDI_CACHE"/mondorescue.iso" );
+    asprintf(&command, "dd if=%s of=%s bs=2048", MINDI_CACHE"/mondorescue.iso", ntapedev );
     res = run_program_and_log_output(command, 1);
     paranoid_free(command);