Changeset 1977 in MondoRescue for branches/stable/mondo/src/common/libmondo-cli.c

Timestamp:

Jun 2, 2008, 10:49:01 AM (16 years ago)

Author:

Bruno Cornec

Message:

svn merge -r 1938:1976 $SVN_M/branches/2.2.6

File:

• branches/stable/mondo/src/common/libmondo-cli.c (modified) (35 diffs)

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

@@ -199 +199 @@
 /* Reference to global bkpinfo */
 extern struct s_bkpinfo *bkpinfo;
+
+extern void free_MR_global_filenames(void);
 
 /**
@@ -349 +351 @@
     bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
 
-/* compulsory */
+    /* compulsory */
     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['U'];
-    if (i == 0) {
+    if ((i == 0) && (! bkpinfo->restore_data)) {
         retval++;
         log_to_screen("You must specify the media type\n");
@@ -361 +363 @@
         log_to_screen("Please specify only one media type\n");
     }
+
     if (flag_set['K']) {
         g_loglevel = atoi(flag_val['K']);
-            log_msg(1,"Loglevel forced to %s",g_loglevel);
+            log_msg(1,"Loglevel forced to %d",g_loglevel);
         if (g_loglevel < 3) {
             g_loglevel = 3;
         }
     }
-    if (flag_set['L'] && flag_set['0']) {
+
+    if ((flag_set['L'] && flag_set['0']) && (! bkpinfo->restore_data)) {
         retval++;
         log_to_screen("You cannot have 'no compression' _and_ LZOP.\n");
     }
-    bkpinfo->backup_data = flag_set['O'];
+    if (! bkpinfo->restore_data) {
+        bkpinfo->backup_data = flag_set['O'];
+    }
     bkpinfo->verify_data = flag_set['V'];
+
     if (flag_set['I'] && !bkpinfo->backup_data) {
         log_to_screen("-I switch is ignored if just verifying");
@@ -401 +408 @@
         }
     }
-    if (flag_set['W']) {
+
+    if ((flag_set['W']) && (! bkpinfo->restore_data)) {
         bkpinfo->nonbootable_backup = TRUE;
         log_to_screen("Warning - you have opted for non-bootable backup");
@@ -409 +417 @@
         }
     }
-    if (flag_set['t'] && flag_set['H']) {
+
+    if ((flag_set['t'] && flag_set['H']) && (! bkpinfo->restore_data)) {
         fatal_error
             ("Sorry, you may not nuke w/o warning from tape. Drop -H, please.");
     }
+
     if (flag_set['I']) {
         if (!strcmp(bkpinfo->include_paths, "/")) {
@@ -430 +440 @@
             if (q != NULL) {
                 *q = '\0';
-                if (stat(p, &buf) != 0) {
+                if ((stat(p, &buf) != 0) && (! bkpinfo->restore_data)) {
                     log_msg(1, "ERROR ! %s doesn't exist", p);
                     fatal_error("ERROR ! You specified a directory to include which doesn't exist");
@@ -436 +446 @@
                 p = q+1 ;
             } else {
-                if (stat(p, &buf) != 0) {
+                if ((stat(p, &buf) != 0) && (! bkpinfo->restore_data)) {
                     log_msg(1, "ERROR ! %s doesn't exist", p);
                     fatal_error("ERROR ! You specified a directory to include which doesn't exist");
@@ -456 +466 @@
 
     if (g_kernel_version >= 2.6 && !flag_set['d']
-        && (flag_set['c'] || flag_set['w'])) {
+        && (flag_set['c'] || flag_set['w']) && (! bkpinfo->restore_data)) {
         fatal_error
             ("If you are using the 2.6.x kernel, please specify the CD-R(W) device.");
@@ -471 +481 @@
         strcpy(bkpinfo->include_paths, flag_val['J']);
     }
-    if (flag_set['c'] || flag_set['w'] || flag_set['C'] || flag_set['r']) {
+
+    if ((flag_set['c'] || flag_set['w'] || flag_set['C'] || flag_set['r']) && (! bkpinfo->restore_data)) {
         if (!flag_set['r'] && g_kernel_version <= 2.5
             && strstr(flag_val['d'], "/dev/")) {
@@ -522 +533 @@
         }
     }
-    if (flag_set['t'] && !flag_set['d']) {
+
+    if ((flag_set['t'] && !flag_set['d']) && (! bkpinfo->restore_data)) {
         log_it("Hmm! No tape drive specified. Let's see what we can do.");
         if (find_tape_device_and_size(flag_val['d'], tmp)) {
@@ -540 +552 @@
         if (! flag_set['d']) {
             fatal_error
-                ("You need to specify a device file with -d for bootable USB device creation");
-        }
-        if (!flag_set['s']) {
+                ("You need to specify a device file with -d for bootable USB device usage");
+        }
+        if ((!flag_set['s']) && (! bkpinfo->restore_data)) {
             fatal_error("You did not specify a size (-s) for your USB device. Aborting");
         }
@@ -559 +571 @@
             }
         }
-        if (!find_home_of_exe("growisofs")) {
-            fatal_error
-                ("Please install growisofs (probably part of dvd+rw-tools). If you want DVD support, you need it.");
-        }
-        if (!find_home_of_exe("dvd+rw-format")) {
-            fatal_error
-                ("Please install dvd+rw-format (probably part of dvd+rw-tools). If you want DVD support, you need it.");
-        }
         if (strchr(flag_val['d'], ',')) {
             fatal_error
                 ("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
         }
-        if (!flag_set['s']) {
-            sprintf(flag_val['s'], "%d", DEFAULT_DVD_DISK_SIZE);    // 4.7 salesman's GB = 4.482 real GB = 4582 MB
-            strcat(flag_val['s'], "m");
-            log_to_screen
-                ("You did not specify a size (-s) for DVD. I'm guessing %s.",
-                 flag_val['s']);
-            flag_set['s'] = 1;
+        if (! bkpinfo->restore_data) {
+            if (!find_home_of_exe("growisofs")) {
+                fatal_error
+                    ("Please install growisofs (probably part of dvd+rw-tools). If you want DVD support, you need it.");
+            }
+            if (!find_home_of_exe("dvd+rw-format")) {
+                fatal_error
+                    ("Please install dvd+rw-format (probably part of dvd+rw-tools). If you want DVD support, you need it.");
+            }
+            if (!flag_set['s']) {
+                sprintf(flag_val['s'], "%d", DEFAULT_DVD_DISK_SIZE);    // 4.7 salesman's GB = 4.482 real GB = 4582 MB
+                strcat(flag_val['s'], "m");
+                log_to_screen
+                    ("You did not specify a size (-s) for DVD. I'm guessing %s.",
+                    flag_val['s']);
+                flag_set['s'] = 1;
+            }
         }
 /*
@@ -591 +605 @@
                 ("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
         }
-        if (flag_set['O']) {
+        if ((flag_set['O']) && (! bkpinfo->restore_data)) {
             if (flag_set['s']) {
                 if (flag_set['t']) {
@@ -609 +623 @@
             }
         }
-    } else {                    /* CD|USB size */
+    } else if (! bkpinfo->restore_data) {           /* CD|USB size */
         if (flag_set['s']) {
             if (process_the_s_switch(flag_val['s'])) {
@@ -619 +633 @@
         }                       /* CD-RW */
     }
+
     if (flag_set['n']) {
         strncpy(bkpinfo->nfs_mount, flag_val['n'], MAX_STR_LEN);
@@ -636 +651 @@
         log_msg(3, "isodir= %s", bkpinfo->isodir);
     }
+
     if (flag_set['c']) {
         bkpinfo->backup_media_type = cdr;
@@ -702 +718 @@
                 q++;
                 /* End of bug fix */
-                if (stat(p, &buf) != 0) {
+                if ((stat(p, &buf) != 0) && (! bkpinfo->restore_data)) {
                     log_msg(1, "WARNING ! %s doesn't exist", p);
                 }
                 p = q+1 ;
             } else {
-                if (stat(p, &buf) != 0) {
+                if ((stat(p, &buf) != 0) && (! bkpinfo->restore_data)) {
                     log_msg(1, "WARNING ! %s doesn't exist", p);
                 }
@@ -719 +735 @@
                 4*MAX_STR_LEN - strlen(bkpinfo->exclude_paths));
     }
+
     if (flag_set['e']) {
         bkpinfo->please_dont_eject = TRUE;
     }
-    if (flag_set['N'])          // exclude NFS mounts & devices
+
+    if ((flag_set['N']) && (! bkpinfo->restore_data))       // exclude NFS mounts & devices
     {
 //      strncpy(psz, list_of_NFS_devices_and_mounts(), MAX_STR_LEN);
@@ -733 +751 @@
                 bkpinfo->exclude_paths);
     }
+
     if (strlen(bkpinfo->exclude_paths) >= 4*MAX_STR_LEN) {
         fatal_error
             ("Your '-E' parameter is too long. Increase MAX_STR_LEN");
     }
+
     if (flag_set['b']) {
         strcpy(psz, flag_val['b']);
@@ -754 +774 @@
         bkpinfo->internal_tape_block_size = itbs;
     }
-    if (flag_set['D']) {
+
+    if ((flag_set['D']) && (! bkpinfo->restore_data)) {
         bkpinfo->differential = 1;
 //      bkpinfo->differential = atoi (flag_val['D']);
@@ -762 +783 @@
         }
     }
+
     if (flag_set['x']) {
         strncpy(bkpinfo->image_devs, flag_val['x'], MAX_STR_LEN / 4);
-        if (run_program_and_log_output("which ntfsclone", 2)) {
+        if ((run_program_and_log_output("which ntfsclone", 2)) && (! bkpinfo->restore_data)) {
             fatal_error("Please install ntfsprogs package/tarball.");
         }
     }
+
     if (flag_set['m']) {
         bkpinfo->manual_cd_tray = TRUE;
     }
-    if (flag_set['k']) {
+
+    if ((flag_set['k']) && (! bkpinfo->restore_data)) {
         strncpy(bkpinfo->kernel_path, flag_val['k'], MAX_STR_LEN);
         if (!strcmp(bkpinfo->kernel_path, "failsafe")) {
@@ -785 +809 @@
         }
     }
+
     if (flag_set['p']) {
         strncpy(bkpinfo->prefix, flag_val['p'], MAX_STR_LEN / 4);
-    }
-
+        log_msg(1,"Prefix forced to %s",bkpinfo->prefix);
+    }
 
     if (flag_set['d']) {        /* backup directory (if ISO/NFS) */
@@ -801 +826 @@
             strncpy(bkpinfo->nfs_remote_dir, flag_val['d'], MAX_STR_LEN);
         } else {                /* backup device (if tape/CD-R/CD-RW) */
-
             strncpy(bkpinfo->media_device, flag_val['d'], MAX_STR_LEN / 4);
         }
     }
 
-    if (flag_set['n']) {
+    if ((flag_set['n']) && (! bkpinfo->restore_data)) {
         asprintf(&tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->nfs_remote_dir);
         sprintf(tmp, "echo hi > %s", tmp1);
@@ -839 +863 @@
     }
 
-    if (!flag_set['d'] && !flag_set['n'] && !flag_set['C']) {
+    if ((!flag_set['d'] && !flag_set['n'] && !flag_set['C']) && (! bkpinfo->restore_data)) {
         retval++;
         log_to_screen("Please specify the backup device/directory.\n");
@@ -845 +869 @@
             ("You didn't use -d to specify the backup device/directory.");
     }
-/* optional, obscure */
+
     for (i = '0'; i <= '9'; i++) {
         if (flag_set[i]) {
@@ -851 +875 @@
         }                       /* not '\0' but '0' */
     }
+
     if (flag_set['S']) {
         sprintf(bkpinfo->scratchdir, "%s/mondo.scratch.%ld", flag_val['S'],
                 random() % 32768);
     }
+
     if (flag_set['T']) {
         setup_tmpdir(flag_val['T']);
@@ -872 +898 @@
         }
     }
-    if (flag_set['A']) {
+
+    if ((flag_set['A']) && (! bkpinfo->restore_data)) {
         strncpy(bkpinfo->call_after_iso, flag_val['A'], MAX_STR_LEN);
     }
-    if (flag_set['B']) {
+
+    if ((flag_set['B']) && (! bkpinfo->restore_data)) {
         strncpy(bkpinfo->call_before_iso, flag_val['B'], MAX_STR_LEN);
     }
-    if (flag_set['H']) {
+
+    if ((flag_set['H']) && (! bkpinfo->restore_data)) {
         g_cd_recovery = TRUE;
     }
-    if (flag_set['l']) {
+
+    if ((flag_set['l']) && (! bkpinfo->restore_data)) {
 #ifdef __FreeBSD__
 #  define BOOT_LOADER_CHARS "GLBMR"
@@ -901 +931 @@
 #undef BOOT_LOADER_CHARS
     }
+
     if (flag_set['f']) {
         strncpy(bkpinfo->boot_device,
@@ -907 +938 @@
                 MAX_STR_LEN / 4);
     }
-    if (flag_set['P']) {
+
+    if ((flag_set['P']) && (! bkpinfo->restore_data)) {
         strncpy(bkpinfo->postnuke_tarball, flag_val['P'], MAX_STR_LEN);
     }
+
     if (flag_set['Q']) {
         i = which_boot_loader(tmp);
@@ -916 +949 @@
         finish(0);
     }
-    if (flag_set['L']) {
+
+    if ((flag_set['L']) && (! bkpinfo->restore_data)) {
         bkpinfo->use_lzo = TRUE;
         if (run_program_and_log_output("which lzop", 2)) {
@@ -925 +959 @@
     }
 
-    if (flag_set['G']) {
+    if ((flag_set['G']) && (! bkpinfo->restore_data)) {
         bkpinfo->use_gzip = TRUE;
         if (run_program_and_log_output("which gzip", 2)) {
@@ -934 +968 @@
     }
 
-    if (!flag_set['o']
-        &&
-        !run_program_and_log_output
-        ("grep -Ei suse /etc/issue.net | grep -E '9.0' | grep 64", 2)) {
+    bkpinfo->use_obdr = FALSE;
+    if (flag_set['o']) {
+        if ((!flag_set['t']) && (! bkpinfo->restore_data)) {
+            log_to_screen("OBDR support is only available for tapes. Use the -t option");
+            fatal_error("Aborting");
+        }
+        bkpinfo->use_obdr = TRUE;
+    }
+
+#ifndef __FreeBSD__
+    if ((!is_this_a_valid_disk_format("vfat")) && (! bkpinfo->restore_data)) {
         bkpinfo->make_cd_use_lilo = TRUE;
         log_to_screen
-            ("Forcing you to use LILO. SuSE 9.0 (64-bit) has a broken mkfs.vfat binary.");
-    }
-    if (flag_set['o']) {
+            ("Your kernel appears not to support vfat filesystems. I am therefore");
+        log_to_screen
+            ("using LILO instead of SYSLINUX as the media boot loader.");
+    }
+    if ((run_program_and_log_output("which mkfs.vfat", 2)) && (! bkpinfo->restore_data)) {
         bkpinfo->make_cd_use_lilo = TRUE;
-    }
-#ifndef __FreeBSD__
-    else {
-        if (!is_this_a_valid_disk_format("vfat")) {
-            bkpinfo->make_cd_use_lilo = TRUE;
-            log_to_screen
-                ("Your kernel appears not to support vfat filesystems. I am therefore");
-            log_to_screen
-                ("using LILO instead of SYSLINUX as the media boot loader.");
-        }
-        if (run_program_and_log_output("which mkfs.vfat", 2)) {
-            bkpinfo->make_cd_use_lilo = TRUE;
 #ifdef __IA32__
-            log_to_screen
-                ("Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as");
-            log_to_screen
-                ("your boot loader. I shall therefore use LILO instead.");
+        log_to_screen
+            ("Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as");
+        log_to_screen
+            ("your boot loader. I shall therefore use LILO instead.");
 #endif
 #ifdef __IA64__
-            log_to_screen
-                ("Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI");
-            log_to_screen("environment correctly. Please install it.");
-            fatal_error("Aborting");
+        log_to_screen
+            ("Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI");
+        log_to_screen("environment correctly. Please install it.");
+        fatal_error("Aborting");
 #endif
-        }
+    }
 #ifdef __IA64__
-        /* We force ELILO usage on IA64 */
-        bkpinfo->make_cd_use_lilo = TRUE;
+    /* We force ELILO usage on IA64 */
+    bkpinfo->make_cd_use_lilo = TRUE;
 #endif
-    }
 #endif
 
@@ -980 +1010 @@
     }
 
-    if ( ! bkpinfo->restore_data ) {
+    if (! bkpinfo->restore_data) {
         i = flag_set['O'] + flag_set['V'];
         if (i == 0) {
             retval++;
             log_to_screen("Specify backup (-O), verify (-V) or both (-OV).\n");
+        }
+    }
+
+    if ((! bkpinfo->restore_data) && (flag_set['Z'])) {
+            fatal_error
+                ("The -Z switch is only valid in restore mode");
+    }
+
+    if (flag_set['Z']) {
+        if (! strcmp(flag_val['Z'], "nuke")) {
+            bkpinfo->restore_mode = nuke;
+        } else if (! strcmp(flag_val['Z'], "interactive")) {
+            bkpinfo->restore_mode = interactive;
+        } else if (! strcmp(flag_val['Z'], "compare")) {
+            bkpinfo->restore_mode = compare;
+        } else if (! strcmp(flag_val['Z'], "mbr")) {
+            bkpinfo->restore_mode = mbr;
+        } else if (! strcmp(flag_val['Z'], "iso")) {
+            bkpinfo->restore_mode = isoonly;
+        } else if (! strcmp(flag_val['Z'], "isonuke")) {
+            bkpinfo->restore_mode = isonuke;
+        } else {
+            bkpinfo->restore_mode = interactive;
         }
     }
@@ -1082 +1135 @@
 void help_screen()
 {
-    log_msg(1, "Type 'man mondo-archive' for more information\n");
+    log_msg(1, "Type 'man mondoarchive' for more information\n");
     exit(1);
 }
@@ -1141 +1194 @@
     }
     kill_buffer();
+
+    free_MR_global_filenames();
+
     fatal_error
-        ("Mondoarchive is terminating in response to a signal from the OS");
+        ("MondoRescue is terminating in response to a signal from the OS");
     finish(254);                // just in case
 }