Changeset 3086 in MondoRescue for branches

Timestamp:

Mar 8, 2013, 6:29:36 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Fix #651 by removing a potential dmsetup conf before formating the USB with mkdosfs (Matthew Ross)

File:

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

branches/3.0/mindi/mindi

@@ -1571 +1571 @@
     if [ $? -ne 0 ]; then
         LogAll "ERROR: Unable to access $USBDEVICE"
-        LogAll "       Make sure your USB device is pluged in"
+        LogAll "       Make sure your USB device is plugged in"
         MindiExit -1
     fi
@@ -1606 +1606 @@
     if [ $? -ne 0 ]; then
         LogAll "ERROR: Unable to create a vfat Filesystem on $USBDEVICE"
-        LogAll "       Make sure your USB device is pluged in"
+        LogAll "       Make sure your USB device is plugged in"
         $FDISK -l $USBDEVICE 2>&1 | tee -a $LOGFILE
         MindiExit -1
@@ -1626 +1626 @@
     umount $USBPART 2>> $LOGFILE 1>> $LOGFILE
     echo -en "."
+    # Some distro have a dmsetup conf at that point so removing it Cf: http://trac.mondorescue.org/ticket/651
+    if [ "`which dmsetup`" != "" ]; then
+        block_id="`echo $USBPART | sed 's|/dev/||g'`"
+        if [[ "`dmsetup ls | awk '{print $1}' | grep $block_id`" != "" ]]; then
+            LogFile "INFO: Removing $block_id from device mapper."
+            sleep 1
+            dmsetup remove $block_id
+        fi
+    fi
+    echo -en "."
     LogFile "INFO: Creating a vfat filesystem on $USBPART"
     mkdosfs -F 32 $USBPART 2>&1 >> $LOGFILE
     if [ $? -ne 0 ]; then
         LogAll "ERROR: Unable to create a vfat filesystem on $USBPART"
-        LogAll "       Make sure your USB device is pluged in and partitioned ($USBPART must exist on it)"
+        LogAll "       Make sure your USB device is plugged in and partitioned ($USBPART must exist on it)"
         $FDISK -l $USBDEVICE 2>&1 | tee -a $LOGFILE
         MindiExit -1
@@ -1639 +1649 @@
     if [ $? -ne 0 ]; then
         LogAll "ERROR: Unable to mount $USBPART on $MINDI_TMP/usb"
-        LogAll "       Make sure your USB device is pluged in, partitioned and formated ($USBPART must exist on it)"
+        LogAll "       Make sure your USB device is plugged in, partitioned and formated ($USBPART must exist on it)"
         $FDISK -l $USBDEVICE 2>&1 | tee -a $LOGFILE
         MindiExit -1