Changeset 1791 in MondoRescue

Timestamp:

Nov 13, 2007, 3:33:28 PM (16 years ago)

Author:

Bruno Cornec

Message:

Do not mount /boot if it's already mounted - avoids ESX hang

Location:

branches/2.2.5

Files:

• mindi/mindi (modified) (1 diff)
• mondo/src/common/libmondo-tools.c (modified) (1 diff)

branches/2.2.5/mindi/mindi

@@ -3198 +3198 @@
     /usr/sbin/esxcfg-module -l >> $LOGFILE
     MODULES="$MODULES `/usr/sbin/esxcfg-module -l | awk '{print $1}'`"
-    DF="/bin/vdf"
+    #DF="/usr/sbin/vdf"
 fi
 echo "-------------" >> $LOGFILE

branches/2.2.5/mondo/src/common/libmondo-tools.c

@@ -1436 +1436 @@
     if (tmp[0]) {
         log_it("/boot is at %s according to /etc/fstab", tmp);
-        if ((strstr(tmp, "LABEL=") || strstr(tmp,"UUID="))) {
-            if (!run_program_and_log_output("mount /boot", 5)) {
-                strcpy(g_boot_mountpt, "/boot");
-                log_msg(1, "Mounted /boot");
+        strcpy(command, "mount | grep -Ew '/boot'");
+        strcpy(tmp, call_program_and_get_last_line_of_output(command));
+        if (strcmp(tmp,"")) {
+            /* Found something */
+            strcpy(g_boot_mountpt, "/boot");
+        } else {
+            if ((strstr(tmp, "LABEL=") || strstr(tmp,"UUID="))) {
+                if (!run_program_and_log_output("mount /boot", 5)) {
+                    strcpy(g_boot_mountpt, "/boot");
+                    log_msg(1, "Mounted /boot");
+                } else {
+                    log_it("...ignored cos it's a label or uuid :-)");
+                }
             } else {
-                log_it("...ignored cos it's a label or uuid :-)");
-            }
-        } else {
-            sprintf(command, "mount | grep -E '^%s'", tmp);
-            log_msg(3, "command = %s", command);
-            if (run_program_and_log_output(command, 5)) {
-                strcpy(g_boot_mountpt, tmp);
-                sprintf(tmp,
-                        "%s (your /boot partition) is not mounted. I'll mount it before backing up",
-                        g_boot_mountpt);
-                log_it(tmp);
-                sprintf(tmp, "mount %s", g_boot_mountpt);
-                if (run_program_and_log_output(tmp, 5)) {
-                    g_boot_mountpt[0] = '\0';
-                    log_msg(1, "Plan B");
-                    if (!run_program_and_log_output("mount /boot", 5)) {
-                        strcpy(g_boot_mountpt, "/boot");
-                        log_msg(1, "Plan B worked");
-                    } else {
-                        log_msg(1,
+                sprintf(command, "mount | grep -E '^%s'", tmp);
+                log_msg(3, "command = %s", command);
+                if (run_program_and_log_output(command, 5)) {
+                    strcpy(g_boot_mountpt, tmp);
+                    sprintf(tmp,
+                            "%s (your /boot partition) is not mounted. I'll mount it before backing up",
+                            g_boot_mountpt);
+                    log_it(tmp);
+                    sprintf(tmp, "mount %s", g_boot_mountpt);
+                    if (run_program_and_log_output(tmp, 5)) {
+                        g_boot_mountpt[0] = '\0';
+                        log_msg(1, "Plan B");
+                        if (!run_program_and_log_output("mount /boot", 5)) {
+                            strcpy(g_boot_mountpt, "/boot");
+                            log_msg(1, "Plan B worked");
+                        } else {
+                            log_msg(1,
                                 "Plan B failed. Unable to mount /boot for backup purposes. This probably means /boot is mounted already, or doesn't have its own partition.");
+                        }
                     }
                 }