Changeset 3057 in MondoRescue

Timestamp:

Nov 2, 2012, 8:28:12 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Fix #611 by changing make-me-bootable to first desactivate all active partitions on the given disk, and then reactivate only the one needed (change of interface for this script). This remains not very satisfactory, and storing active flags at backup time would probably be better, but would require to handle HW modification cases with this script anyway.

Location:

branches/3.0/mondo/src

Files:

• mondorestore/mondo-prep.c (modified) (1 diff)
• restore-scripts/mondo/make-me-bootable (modified) (2 diffs)

branches/3.0/mondo/src/mondorestore/mondo-prep.c

@@ -1691 +1691 @@
 
     if (pout_to_fdisk) {
-// mark relevant partition as bootable
-        sprintf(tmp, "a\n%s\n",
-                call_program_and_get_last_line_of_output
-                ("make-me-bootable /tmp/mountlist.txt dummy"));
-        fput_string_one_char_at_a_time(pout_to_fdisk, tmp);
-// close fdisk
+        // close fdisk
         fput_string_one_char_at_a_time(pout_to_fdisk, "p\n");
         fput_string_one_char_at_a_time(pout_to_fdisk, "w\n");
+        paranoid_pclose(pout_to_fdisk);
         system("sync");
-        paranoid_pclose(pout_to_fdisk);
-        log_msg(0,
-                "------------------- fdisk.log looks like this ------------------");
+        log_msg(0,"------------------- fdisk.log looks like this ------------------");
         sprintf(tmp, "cat %s >> %s", FDISK_LOG, MONDO_LOGFILE);
         system(tmp);
-        log_msg(0,
-                "------------------- end of fdisk.log...       ------------------");
+        // mark relevant partition as bootable
+        mr_asprintf(&tmp1,"make-me-bootable /tmp/mountlist.txt %s noaction",drivename);
+        call_program_and_get_last_line_of_output(tmp1);
+        mr_free(tmp1);
+        log_msg(0,"------------------- end of fdisk.log...       ------------------");
+        system("sync");
         sprintf(tmp, "tail -n6 %s | grep -F \"16: \"", FDISK_LOG);
         if (!run_program_and_log_output(tmp, 5)) {

branches/3.0/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 "Will activate $p on $drive" >> $LOGFILE
+    else
+        echo -en "${cmd}a\n$partno\np\nw\n" | parted2fdisk $drive >> $LOGFILE 2>> $LOGFILE
+    fi
 fi
 exit 0