Changeset 2851 in MondoRescue for branches/2.2.9/mindi/mindi

Timestamp:

Jul 25, 2011, 11:48:36 AM (13 years ago)

Author:

Bruno Cornec

Message:

• mindi only sets the boot flag of a USB device if none is present already (should avoid flip/flop situation)

File:

• branches/2.2.9/mindi/mindi (modified) (4 diffs)

branches/2.2.9/mindi/mindi

@@ -1499 +1499 @@
     echo "Transforming $USBDEVICE in a Bootable device"  >> $LOGFILE
     echo "Checking $USBDEVICE" >> $LOGFILE
-    $FDISK -l $USBDEVICE 2>> $LOGFILE 1>> $LOGFILE
+    $FDISK -l $USBDEVICE 2>> $LOGFILE 1> $MINDI_TMP/fdisk.log
+    cat $MINDI_TMP/fdisk.log >> $LOGFILE
     if [ $? -ne 0 ]; then
         echo "Unable to access $USBDEVICE" | tee -a $LOGFILE
@@ -1511 +1512 @@
     # Use dd if=mbr.bin of=$USBDEVICE or ms-sys -s $USBDEVICE
     echo "Preparing $USBDEVICE" >> $LOGFILE
-    $FDISK $USBDEVICE 2>> $LOGFILE 1>> $LOGFILE << EOF
+    cat > $MINDI_TMP/fdisk.txt << EOF
 d
 d
@@ -1523 +1524 @@
 t
 b
+w
+EOF
+    # Search for bootable flag
+    grep '* ' $MINDI_TMP/fdisk.log | grep $USBDEVICE
+    if [ $? -ne 0 ]; then
+        cat >> $MINDI_TMP/fdisk.txt << EOF
 a
 1
 w
 EOF
+    fi
+    $FDISK $USBDEVICE 2>> $LOGFILE 1>> $LOGFILE < $MINDI_TMP/fdisk.txt
     if [ $? -ne 0 ]; then
         echo "Unable to create a vfat Filesystem on $USBDEVICE" | tee -a $LOGFILE
@@ -1533 +1542 @@
         MindiExit -1
     fi
+    echo "fdisk build file" >> $LOGFILE
+    echo "----------------" >> $LOGFILE
+    cat $MINDI_TMP/fdisk.txt >> $LOGFILE
+    echo "----------------" >> $LOGFILE
+    rm -f $MINDI_TMP/fdisk.log $MINDI_TMP/fdisk.txt
     echo "The USB device $USBDEVICE now looks like this:" >> $LOGFILE
     $FDISK -l $USBDEVICE 2>&1 | tee -a $LOGFILE