Changeset 1688

Timestamp:

10/20/07 20:07:36 (3 years ago)

Author:

bruno

Message:

Try to add USB support for mondoarchive with new functions

Files:

• branches/2.2.5/mindi/mindi (modified) (1 diff)
• branches/2.2.5/mondo/src/common/libmondo-archive.c (modified) (2 diffs)
• branches/2.2.5/mondo/src/common/libmondo-fork.c (modified) (1 diff)
• branches/2.2.5/mondo/src/common/my-stuff.h (modified) (2 diffs)

branches/2.2.5/mindi/mindi

@@ -1735 +1735 @@
-    echo -en "."
-    echo "Creating a vfat filesystem on $USBPART" >> $LOGFILE
-fs -t vfat
+dosfs -F 32
-    if [ $? -ne 0 ]; then
-        echo "Unable to create a vfat filesystem on $USBPART" | tee -a $LOGFILE

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

@@ -1844 +1844 @@
-}
-
+
+
+
+/**
+ * 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(char *destfile)
+{
+    /*@ int ********************************************** */
+    int retval = 0;
+    int res;
+
+    /*@ buffers ****************************************** */
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *message_to_screen = NULL;
+    char *old_pwd;
+
+    malloc_string(old_pwd);
+    assert(bkpinfo != NULL);
+    assert_string_is_neither_NULL_nor_zerolength(destfile);
+
+    log_msg(2, "make_usb_fs --- scratchdir=%s --- destfile=%s",
+            bkpinfo->scratchdir, destfile);
+    (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);
+    asprintf(&tmp, "mount %s %s", bkpinfo->media_device, tmp1);
+    run_program_and_log_output(tmp, FALSE);
+    paranoid_free(tmp);
+    paranoid_free(tmp1);
+
+    if (bkpinfo->nonbootable_backup) {
+        log_msg(1, "Making nonbootable USB backup not implemented yet");
+    } else {
+        log_msg(1, "Making bootable backup");
+
+        asprintf(&tmp,"cp -rp %s/* %s", bkpinfo->scratchdir, ); /* Command to execute */
+        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);
+
+    if (is_this_device_mounted(bkpinfo->media_device)) {
+        asprintf(&tmp, "umount %s", 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);
+}
-
-
@@ -3843 +3934 @@
-            g_current_media_number);
-    for (that_one_was_ok = FALSE; !that_one_was_ok;) {
-
+
+
+
+
+
-        if (g_current_media_number == 1 && !res
-            && (bkpinfo->backup_media_type == cdr

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

@@ -299 +299 @@
-
-
+/**
+ * Call copy of data to create an USB image.
+ * @param bkpinfo The backup information structure. Fields used:
+ * - @c bkpinfo->backup_media_type
+ * @return Exit code of @c copy (0 is success, anything else indicates failure).
+ */
+int
+eval_call_to_make_USB(char *command, char *what_i_am_doing) {
+
+    /*@ int's  *** */
+    int retval = 0;
+
+
+/*@***********   End Variables ***************************************/
+
+    log_msg(3, "Starting");
+    assert(bkpinfo != NULL);
+
+    log_to_screen
+        ("Please be patient. Do not be alarmed by on-screen inactivity.");
+    log_msg(4, "Calling open_evalcall_form() with what_i_am_doing='%s'",
+            what_i_am_doing);
+
+    if (!g_text_mode) {
+        newtSuspend();
+    }
+    log_msg(1, "command = '%s'", command);
+    if (!g_text_mode) {
+        retval = run_external_binary_with_percentage_indicator_NEW
+            (what_i_am_doing, command);
+    } else {
+        retval += system(command);
+    }
+    if (!g_text_mode) {
+        newtResume();
+    }
+
+    return (retval);
+}
+
+
-
-

branches/2.2.5/mondo/src/common/my-stuff.h

@@ -463 +463 @@
-#define VANILLA_SCSI_CDROM  "/dev/cd0"
-#define VANILLA_SCSI_TAPE   "/dev/sa0"
+#define VANILLA_USB_DEVICE  "tobegivenbybsdguru"
-#define DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE  "/dev/vinum/"
-#define RAID_DEVICE_STUB    DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE
@@ -472 +473 @@
-#define VANILLA_SCSI_CDROM  "/dev/scd0"
-#define VANILLA_SCSI_TAPE   "/dev/st0"
+#define VANILLA_USB_DEVICE  "/dev/hda"
-#define DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE  "/dev/md"
-#define RAID_DEVICE_STUB    DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE