Changeset 1496 in MondoRescue for branches/2.2.4/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Jun 9, 2007, 12:32:38 AM (17 years ago)

Author:

Bruno Cornec

Message:

Attempt to fix #136 (without floppy mondorestore may hang due to a mount command blocked)

File:

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

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

@@ -2411 +2411 @@
     run_program_and_log_output(tmp, FALSE);
 
-    sprintf(command, "mount /dev/fd0u1722 %s", mountpt);
-    sprintf(tmp,
+    /* Is there a floppy drive detected */
+    sprintf(tmp, "%s", call_program_and_get_last_line_of_output("dmesg | grep -i floppy"));
+    if (strcmp(tmp, "")) {
+        sprintf(command, "mount /dev/fd0u1722 %s", mountpt);
+        sprintf(tmp,
             "(sleep 15; kill `ps | grep \"%s\" | cut -d' ' -f1` 2> /dev/null) &",
             command);
-    log_msg(1, "tmp = '%s'", tmp);
-    system(tmp);
-    res = run_program_and_log_output(command, FALSE);
-    if (res) {
-        sprintf(command, "mount /dev/fd0H1440 %s", mountpt);
+        log_msg(1, "tmp = '%s'", tmp);
+        system(tmp);
         res = run_program_and_log_output(command, FALSE);
+        if (res) {
+            sprintf(command, "mount /dev/fd0H1440 %s", mountpt);
+            res = run_program_and_log_output(command, FALSE);
+        }
+    } else {
+        res = 1;
     }
     if (res) {
@@ -2428 +2434 @@
         log_msg(2,
                 "Mounted floppy OK but I don't trust it because the archives might contain more up-to-date config file than the floppy does.");
-// NB: If busybox does not support 'mount -o loop' then Plan A WILL NOT WORK.
+        // NB: If busybox does not support 'mount -o loop' then Plan A WILL NOT WORK.
         log_msg(2, "Processing floppy (plan A?)");
         sprintf(ramdisk_fname, "%s/mindi.rdz", mountpt);