Changeset 1977 in MondoRescue for branches/stable/mondo/src/common/libmondo-tools.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-tools.c (modified) (4 diffs)

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

@@ -677 +677 @@
 
 void setup_tmpdir(char *path) {
-    
+
     char *tmp = NULL;
     char *p = NULL;
@@ -687 +687 @@
         paranoid_free(tmp);
     }
-        
+
     if (path != NULL) {
         asprintf(&tmp, "%s/mondo.tmp.XXXXXX", path);
@@ -758 +758 @@
     }
     bkpinfo->boot_device[0] = '\0';
-    bkpinfo->restore_path[0] = '\0';
+    bkpinfo->image_devs[0] = '\0';
+    bkpinfo->compression_level = 3;
     bkpinfo->do_not_compress_these[0] = '\0';
     bkpinfo->verify_data = FALSE;
     bkpinfo->backup_data = FALSE;
     bkpinfo->restore_data = FALSE;
+    bkpinfo->use_star = FALSE;
+    bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
     bkpinfo->disaster_recovery =
         (am_I_in_disaster_recovery_mode()? TRUE : FALSE);
@@ -772 +775 @@
     mr_asprintf(&tmp,mr_conf->prefix);
     bkpinfo->prefix = tmp;
-
-    bkpinfo->make_filelist = TRUE;  // unless -J supplied to mondoarchive
+    sensibly_set_tmpdir_and_scratchdir();
+
     bkpinfo->optimal_set_size = 0;
-    bkpinfo->backup_media_type = none;
     bkpinfo->backup_media_string[0] = '\0';
     strcpy(bkpinfo->include_paths, "/");
+    bkpinfo->restore_path[0] = '\0';
     bkpinfo->call_before_iso[0] = '\0';
     bkpinfo->call_make_iso[0] = '\0';
     bkpinfo->call_after_iso[0] = '\0';
-    bkpinfo->image_devs[0] = '\0';
-    bkpinfo->postnuke_tarball[0] = '\0';
     bkpinfo->nfs_mount[0] = '\0';
     bkpinfo->nfs_remote_dir[0] = '\0';
+    bkpinfo->postnuke_tarball[0] = '\0';
     bkpinfo->wipe_media_first = FALSE;
-    bkpinfo->differential = FALSE;
+    bkpinfo->differential = 0;
+    bkpinfo->please_dont_eject = FALSE;
     bkpinfo->writer_speed = mr_conf->iso_burning_speed;
+    bkpinfo->manual_cd_tray = FALSE;
+    bkpinfo->nonbootable_backup = FALSE;
+    bkpinfo->make_cd_use_lilo = FALSE;
+    bkpinfo->use_obdr = FALSE;
+    bkpinfo->restore_mode = interactive;
 }