Changeset 1500 in MondoRescue for branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Jun 9, 2007, 2:05:52 AM (17 years ago)

Author:

Bruno Cornec

Message:

• ChangeLog updated
• Attempt to fix completely #159
• Improve ESX+vmfs support - needs testing
• Attempt to fix #136 (without floppy mondorestore may hang due to a mount command blocked)
• man page fixed as mindi images are now under /var/cache/mindi
• Support Web page now includes all the latest supported distributions
• mondorestore supports now the -p option so man page fixed.
• Fix my email address in mindi man page
• Fix a typo on the support Web page
• Improve isolinux.bin detection on x86_64 system by looking also in /usr/lib64
• Stricter POSIX conformance for all shell scripts (== replaced by = in compare)

(merge -r 1488:1499 $SVN_M/branches/2.2.4)

File:

• branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (2 diffs)

branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -1434 +1434 @@
                 newtSuspend();
             }
-            mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
+            mr_asprintf(&tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
             paranoid_system(tmp);
             mr_free(tmp);
 
-            mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/grub.conf", editor);
+            mr_asprintf(&tmp, "chroot %s %s /etc/grub.conf", MNT_RESTORING, editor);
             paranoid_system(tmp);
             mr_free(tmp);
@@ -2123 +2123 @@
     mr_free(tmp);
 
-    mr_asprintf(&command, "mount /dev/fd0u1722 %s", mountpt);
-    mr_asprintf(&tmp,
+    mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output("dmesg | grep -i floppy"));
+    if (strcmp(tmp, "")) {
+        mr_asprintf(&command, "mount /dev/fd0u1722 %s", mountpt);
+        mr_asprintf(&tmp,
             "(sleep 15; kill `ps | grep \"%s\" | cut -d' ' -f1` 2> /dev/null) &",
             command);
-    mr_msg(1, "tmp = '%s'", tmp);
-    system(tmp);
-    mr_free(tmp);
-
-    res = run_program_and_log_output(command, FALSE);
-    mr_free(command);
-
-    if (res) {
-        mr_asprintf(&command, "mount /dev/fd0H1440 %s", mountpt);
+        mr_msg(1, "tmp = '%s'", tmp);
+        system(tmp);
+        mr_free(tmp);
+
         res = run_program_and_log_output(command, FALSE);
         mr_free(command);
+
+        if (res) {
+            mr_asprintf(&command, "mount /dev/fd0H1440 %s", mountpt);
+            res = run_program_and_log_output(command, FALSE);
+            mr_free(command);
+        }
+    } else {
+        res = 1;
     }
     if (res) {