Changeset 1693 in MondoRescue for branches/stable/mondo/src/common/libmondo-archive.c

Timestamp:

Oct 21, 2007, 3:06:22 AM (17 years ago)

Author:

Bruno Cornec

Message:

• Remove useless copy from mindi to mondo at end of USB handling
• Fix PB macro vs tools/*2build issue
• make_usb_fs change of interface (doesn't need a parameter)
• Fix USB support in mondo to avoid multiple copies of files
• Use first partiion in mondo for USB device
• Fixes for USB CLI for both mondo/mindi
• Try to add USB support for mondoarchive with new functions
• du => deb for similarity with other distro type under pbconf
• migrate gento build files under pb
• remove now obsolete rpm spec file and gentoo build files from distributions
• Remove DOCDIR usage in mindi + various build fixes

(merge -r1680:1692 $SVN_M/branches/2.2.5)

File:

• branches/stable/mondo/src/common/libmondo-archive.c (modified) (3 diffs)

branches/stable/mondo/src/common/libmondo-archive.c

@@ -533 +533 @@
     /*@ buffer ************************************************************ */
     char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *tmp2 = NULL;
     char *command = NULL;
     char *bootldr_str = NULL;
@@ -1534 +1536 @@
     }
     close_evalcall_form();
+}
+
+
+/**
+ * Create a USB image in @c destfile, from files in @c bkpinfo->scratchdir.
+ *
+ * @param bkpinfo The backup information structure. Fields used:
+ * - @c backup_media_type
+ * - @c nonbootable_backup
+ * - @c scratchdir
+ *
+ * @param destfile Where to put the generated USB image.
+ * @return The number of errors encountered (0 for success)
+ */
+int make_usb_fs()
+{
+    /*@ int ********************************************** */
+    int retval = 0;
+    int res;
+
+    /*@ buffers ****************************************** */
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *result_sz = NULL;
+    char *message_to_screen = NULL;
+    char *old_pwd;
+
+    malloc_string(old_pwd);
+    assert(bkpinfo != NULL);
+
+    log_msg(2, "make_usb_fs --- scratchdir=%s", bkpinfo->scratchdir);
+    (void) getcwd(old_pwd, MAX_STR_LEN - 1);
+    asprintf(&tmp, "chmod 755 %s", bkpinfo->scratchdir);
+    run_program_and_log_output(tmp, FALSE);
+    paranoid_free(tmp);
+    chdir(bkpinfo->scratchdir);
+
+    asprintf(&message_to_screen, "Copying data to make %s #%d",
+                media_descriptor_string(bkpinfo->backup_media_type),
+                g_current_media_number);
+    log_msg(1, message_to_screen);
+
+    if (is_this_device_mounted(bkpinfo->media_device)) {
+        log_msg(1, "USB device mounted. Remounting it at the right place");
+        asprintf(&tmp, "umount %s", bkpinfo->media_device);
+        run_program_and_log_output(tmp, FALSE);
+        paranoid_free(tmp);
+    }
+    log_msg(1, "Mounting USB device.");
+    asprintf(&tmp1, "%s/usb", bkpinfo->tmpdir);
+    asprintf(&tmp, "mkdir -p %s", tmp1);
+    run_program_and_log_output(tmp, FALSE);
+    paranoid_free(tmp);
+    /* Mindi always create one single parition on the USB dev */
+    asprintf(&tmp, "mount %s1 %s", bkpinfo->media_device, tmp1);
+    run_program_and_log_output(tmp, FALSE);
+    paranoid_free(tmp);
+
+    if (bkpinfo->nonbootable_backup) {
+        log_msg(1, "Making nonbootable USB backup not implemented yet");
+    } else {
+        log_msg(1, "Making bootable backup");
+
+        /* Command to execute */
+        asprintf(&tmp,"mv %s/.??* %s/* %s", bkpinfo->scratchdir, bkpinfo->scratchdir, tmp1); 
+        res = eval_call_to_make_USB(tmp, message_to_screen);
+        if (res) {
+            asprintf(&result_sz, "%s ...failed",tmp);
+        } else {
+            asprintf(&result_sz, "%s ...OK",tmp);
+        }
+        log_to_screen(result_sz);
+        paranoid_free(result_sz);
+        paranoid_free(tmp);
+        retval += res;
+    }
+    paranoid_free(message_to_screen);
+    paranoid_free(tmp1);
+
+    if (is_this_device_mounted(bkpinfo->media_device)) {
+        asprintf(&tmp, "umount %s1", bkpinfo->media_device);
+        run_program_and_log_output(tmp, FALSE);
+        paranoid_free(tmp);
+    }
+
+    chdir(old_pwd);
+    if (retval) {
+        log_msg(1, "WARNING - make_usb_fs returned an error");
+    }
+    paranoid_free(old_pwd);
+    return (retval);
 }
 
@@ -3154 +3247 @@
             res = make_iso_fs(isofile);
         } else {
+            res = make_usb_fs();
         }
         if (g_current_media_number == 1 && !res