Changeset 3147 in MondoRescue for branches/3.1/mondo/src/restore-scripts/mondo/make-me-bootable

Timestamp:

Jun 19, 2013, 8:34:46 AM (11 years ago)

Author:

Bruno Cornec

Message:

• First pass on svn merge -r 2935:3146 ../3.0

File:

• branches/3.1/mondo/src/restore-scripts/mondo/make-me-bootable (modified) (2 diffs)

branches/3.1/mondo/src/restore-scripts/mondo/make-me-bootable

@@ -2 +2 @@
 
 
-if [ "$#" -ne "1" ] && [ "$#" -ne "2" ] ; then
-    echo "make-me-bootable <fname> (dummy)"
+if [ "$#" -ne "2" ] && [ "$#" -ne "3" ] ; then
+    echo "make-me-bootable <fname> <drive> [noaction]"
     exit 1
 fi
 
-dummy=$2
+drivetouse=$2
 boot_drv=""
 boot_part=""
 root_drv=""
 root_part=""
+if [ ! "$LOGFILE" ]; then
+    LOGFILE="/tmp/mondorestore2.log"
+fi
+dummy="$3"
 
-HAVE_ACTIVE="false"
+activepart=`parted2fdisk -l $drivetouse | tr -s '\t' ' ' | grep "$drivetouse" | grep '*' | cut -d' ' -f1`
+
 for i in `cat $1 | tr -s '\t' ' ' | cut -d' ' -f1 | grep -vE "/dev/fd|none|#"` ; do
-    mountpt=`grep "$i " $1 | tr -s '\t' ' ' | cut -d' ' -f2`
-    format=`grep "$i " $1 | tr -s '\t' ' ' | cut -d' ' -f3`
     # Warning wrong if LVM !
     drive=`echo $i | sed -e 's/[0-9]*$//' -e 's/\([0-9]\)p$/\1/'`
-    partno=`echo $i | sed -e 's/^.*[^0-9]\([0-9]*\)$/\1/'`
+    if [ "$drivetouse" = "$drive" ]; then
+        # We can continue as this is the drive we ned to work on
+        partno=`echo $i | sed -e 's/^.*[^0-9]\([0-9]*\)$/\1/'`
+        mountpt=`grep "$i " $1 | tr -s '\t' ' ' | cut -d' ' -f2`
 
-    if [ "$HAVE_ACTIVE" = "false" ] && [ "`parted2fdisk -l $drive | tr -s '\t' ' ' | grep "$i " | grep -v "*"`" ] ; then
         if [ "$mountpt" = "/" ] ; then
             root_drv=$drive
-        root_part=$partno
+            root_part=$partno
         elif [ "$mountpt" = "/boot" ] ; then
             boot_drv=$drive
@@ -46 +51 @@
 
 if [ "$drive" ] ; then
+    if [ "$partno" = "0" ] || [ ! "$partno" ] ; then
+        partno="1"
+    fi
+    cmd=""
+    for p in "$activepart"; do
+        # First desactivate active partitions (coming from previous usage)
+        cmd="${cmd}a\n$p\n"
+        if [ "$dummy" != "" ] ; then
+            echo "Will desactivate $p on $drive" >> $LOGFILE
+        fi
+    done
+    # Then activate the one which should
     if [ "$dummy" != "" ] ; then
-        if [ "$partno" = "0" ] || [ ! "$partno" ] ; then
-            partno="1"
-        fi
-        echo "$partno"
-    else
-        echo -en "a\n$partno\nw\n" | parted2fdisk $drive >> $LOGFILE 2>> $LOGFILE
-    fi
+        echo "Would activate $partno on $drive" >> $LOGFILE
+    else
+        echo -en "${cmd}a\n$partno\np\nw\n" | parted2fdisk $drive >> $LOGFILE 2>> $LOGFILE
+    fi
 fi
 exit 0