Changeset 1691 in MondoRescue for branches/2.2.5/mondo/src/common/libmondo-archive.c

Timestamp:

Oct 21, 2007, 2:27:53 AM (17 years ago)

Author:

Bruno Cornec

Message:

• 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

File:

• branches/2.2.5/mondo/src/common/libmondo-archive.c (modified) (7 diffs)

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

@@ -1857 +1857 @@
  * @return The number of errors encountered (0 for success)
  */
-int make_usb_fs(char *destfile)
+int make_usb_fs()
 {
     /*@ int ********************************************** */
@@ -1872 +1872 @@
     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);
+
+    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);
@@ -1898 +1896 @@
     run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
-    asprintf(&tmp, "mount %s %s", bkpinfo->media_device, tmp1);
+    /* 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);
@@ -1907 +1906 @@
         log_msg(1, "Making bootable backup");
 
-        asprintf(&tmp,"cp -rp %s/* %s", bkpinfo->scratchdir, tmp1); /* Command to execute */
+        /* 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) {
@@ -1923 +1923 @@
 
     if (is_this_device_mounted(bkpinfo->media_device)) {
-        asprintf(&tmp, "umount %s", bkpinfo->media_device);
+        asprintf(&tmp, "umount %s1", bkpinfo->media_device);
         run_program_and_log_output(tmp, FALSE);
         paranoid_free(tmp);
@@ -1935 +1935 @@
     return (retval);
 }
-
 
 
@@ -3937 +3936 @@
             res = make_iso_fs(isofile);
         } else {
-            res = make_usb_fs(isofile);
+            res = make_usb_fs();
         }
         if (g_current_media_number == 1 && !res