Changeset 2222 in MondoRescue

Timestamp:

Jun 17, 2009, 3:09:22 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Usage of partprobe at restore time if possible
• fix call to fdisk into parted2fdisk

Location:

branches/2.2.9

Files:

• mindi/deplist.txt (modified) (1 diff)
• mindi/mindi (modified) (1 diff)
• mondo/src/common/libmondo-cli.c (modified) (3 diffs)
• mondo/src/mondorestore/mondo-prep.c (modified) (1 diff)

branches/2.2.9/mindi/deplist.txt

@@ -41 +41 @@
 hosts host.conf resolv.conf hosts.allow hosts.deny nsswitch.conf
 klogd sysklogd
-fdisk hdparm uname
+fdisk hdparm uname partprobe
 loadkeys
 # These lines require absolute paths now !

branches/2.2.9/mindi/mindi

@@ -2491 +2491 @@
 fi
 which mke2fs > /dev/null 2> /dev/null || Die "Please put mke2fs in system path"
-[ ! -e "$FDISK" ] && Die "Cannot find (s)fdisk"
+[ ! -e "$FDISK" ] && Die "Cannot find $FDISK"
 
 [ "`uname -r | grep "2.4.[0-6]" | grep -v "2.4.[0-9][0-9]"`" != "" ] &&  echo "WARNING! Your kernel may have buggy loopfs code. Consider upgrading to 2.4.7"

branches/2.2.9/mondo/src/common/libmondo-cli.c

@@ -393 +393 @@
     ********/
     mr_asprintf(&command, 
-      "fdisk -l %s 2>/dev/null|grep -E \"^/dev/\"|awk '{printf(\"%%s \", $1)}END{print \"\"}'", dsf);
+      "parted2fdisk -l %s 2>/dev/null|grep -E \"^/dev/\"|awk '{printf(\"%%s \", $1)}END{print \"\"}'", dsf);
     log_msg(4, "Executing: %s", command);
     mr_asprintf(&partition_list, "%s", call_program_and_get_last_line_of_output(command));
@@ -446 +446 @@
         /* See if it's swap. If it is, ignore it. */
         mr_asprintf(&command,
-          "fdisk -l %s 2>/dev/null | awk '{if(($1==\"%s\")&&(toupper($0) ~ \"SWAP\")){print $1;exit}}'", 
+          "parted2fdisk -l %s 2>/dev/null | awk '{if(($1==\"%s\")&&(toupper($0) ~ \"SWAP\")){print $1;exit}}'", 
           dsf, partitions[i]);
         log_msg(4, "  Running: %s", command);
@@ -477 +477 @@
         log_msg(4, "  It's not mounted. Checking to see if it's LVM...");
         /* Get the partition ID; 8e for LVM */
-        mr_asprintf(&command, "fdisk -l %s |awk '{if($1 ~ \"^%s\"){print $5}}'", dsf, partitions[i]);
+        mr_asprintf(&command, "parted2fdisk -l %s |awk '{if($1 ~ \"^%s\"){print $5}}'", dsf, partitions[i]);
         log_msg(4, "  Running: %s", command);
         mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));

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

@@ -1686 +1686 @@
         if (!run_program_and_log_output(tmp, 5)) {
             g_partition_table_locked_up++;
+        }
+        sprintf(tmp, "partprobe %s", drivename);
+        if (!run_program_and_log_output(tmp, 5)) {
+            g_partition_table_locked_up--;
+        }
+        if (g_partition_table_locked_up > 0) {
             log_to_screen
-                ("A flaw in the Linux kernel has locked the partition table.");
+                ("A flaw in the Linux kernel has locked the partition table. Even calling partprobe did not suceed :-(");
         }
     }