Changeset 1079 in MondoRescue for trunk/mondo/src/mondoarchive/mondo-cli.c

Timestamp:

Jan 28, 2007, 5:58:18 PM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r1045:1078 £SVN_M/branches/stable

File:

• trunk/mondo/src/mondoarchive/mondo-cli.c (modified) (8 diffs)

trunk/mondo/src/mondoarchive/mondo-cli.c

@@ -216 +216 @@
     i = flag_set['c'] + flag_set['i'] + flag_set['n'] +
         flag_set['t'] + flag_set['u'] + flag_set['r'] +
-        flag_set['w'] + flag_set['C'];
+        flag_set['w'] + flag_set['C'] + flag_set['U'];
     if (i == 0) {
         retval++;
@@ -404 +404 @@
     }
 
+    if (flag_set['U'])          // USB
+    {
+        if (! flag_set['d']) {
+            fatal_error
+                ("You need to specify a device file with -d for bootable USB device creation");
+        }
+        if (!flag_set['s']) {
+            fatal_error("You did not specify a size (-s) for your USB device. Aborting");
+        }
+    }
+
     if (flag_set['r'])          // DVD
     {
@@ -453 +464 @@
             }
         }
-    } else {                    /* CD size */
+    } else {                    /* CD|USB size */
         if (flag_set['s']) {
             if (process_the_s_switch(bkpinfo, flag_val['s'])) {
@@ -505 +516 @@
     if (flag_set['w']) {
         bkpinfo->backup_media_type = cdrw;
+    }
+    if (flag_set['U']) {
+        bkpinfo->backup_media_type = usb;
     }
     if (flag_set['z']) {
@@ -641 +655 @@
     }
 
-    if (flag_set['d']) {        /* backup directory (if ISO/NFS) */
+    if (flag_set['d']) {        /* backup directory (if ISO/NFS/USB) */
         if (flag_set['i']) {
             mr_allocstr(bkpinfo->isodir,flag_val['d']);
@@ -653 +667 @@
             mr_allocstr(bkpinfo->nfs_remote_dir,flag_val['d']);
         } else {                /* backup device (if tape/CD-R/CD-RW) */
-
             mr_allocstr(bkpinfo->media_device, flag_val['d']);
         }
@@ -673 +686 @@
 
     if (!flag_set['d']
-        && (flag_set['c'] || flag_set['w'] || flag_set['C'])) {
+        && (flag_set['c'] || flag_set['w'] || flag_set['C'] || flag_set['U'])) {
         if (g_kernel_version >= 2.6) {
             if (popup_and_get_string
@@ -902 +915 @@
     while ((opt =
             getopt(argc, argv,
-                   "0123456789A:B:C:DE:FGHI:J:K:LNOP:QRS:T:VWb:c:d:ef:gik:l:mn:op:rs:tuw:x:z"))
+                   "0123456789A:B:C:DE:FGHI:J:K:LNOP:QRS:T:UVWb:c:d:ef:gik:l:mn:op:rs:tuw:x:z"))
            != -1) {
         if (opt == '?') {