Changeset 2462 in MondoRescue for branches/2.2.10/mondo/src/common

Timestamp:

Oct 20, 2009, 4:07:00 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3548@localhost: bruno | 2009-10-16 19:18:27 +0200

• mindi now boots in a QEMU VM without busybox
• mindi is now noarch as a consequence
• MINDI_LIB becomes MINDI_DATA for coherency and as a consequence
• CACHEDIR becomes MINDI_CACHE for coherency and it's a build parameter and not hardcoded anymore in mindi
• THat variable is also used at restore time for mondorestore.cfg e.g.
• FAILSAFE kernel is gone. Just use another kernel of your choice. Most std kernels work anyway
• TurnTgzIntoRdz rewritten and now really computes data disk size and not suppose its size
• Interface mondo/mindi changed again => incompatible
• Non-bootable media not supported anymore.
• Mondorescue adapted to these changes but not tested yet
• Doc updated as well

Location:

branches/2.2.10/mondo/src/common

Files:

• libmondo-archive.c (modified) (3 diffs)
• libmondo-cli.c (modified) (1 diff)
• libmondo-devices.c (modified) (2 diffs)
• libmondo-filelist.c (modified) (2 diffs)
• libmondo-files.c (modified) (4 diffs)
• libmondo-stream.c (modified) (1 diff)
• libmondo-tools.c (modified) (2 diffs)
• mondostructures.h (modified) (1 diff)

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

@@ -513 +513 @@
     char *bootldr_str = NULL;
     char *tape_device = NULL;
-    char *last_filelist_number = NULL;
     char *broken_bios_sz = NULL;
     char *cd_recovery_sz = NULL;
@@ -546 +545 @@
     }
     lines_in_filelist = count_lines_in_file(tmp);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "%s/LAST-FILELIST-NUMBER", bkpinfo->tmpdir);
-    last_filelist_number = last_line_of_file(tmp);
     mr_free(tmp);
 
@@ -805 +800 @@
             (bkpinfo->image_devs == NULL) ? "\"\"" : bkpinfo->image_devs,   // parameter #10
             broken_bios_sz,     // parameter #11
-            last_filelist_number,   // parameter #12 (STRING)
-            estimated_total_noof_slices,    // parameter #13 (INT)
-            (bkpinfo->exclude_devs == NULL) ? "\"\"" : bkpinfo->exclude_devs,   // parameter #14
-            use_comp_sz,        // parameter #15
-            use_lilo_sz,        // parameter #16
-            use_star_sz,        // parameter #17
-            bkpinfo->internal_tape_block_size,  // parameter #18 (LONG)
-            bkpinfo->differential,  // parameter #19 (INT)
-            use_gzip_sz,        // parameter #20 (STRING)
-            use_lzma_sz,        // parameter #21 (STRING)
+            estimated_total_noof_slices,    // parameter #12 (INT)
+            (bkpinfo->exclude_devs == NULL) ? "\"\"" : bkpinfo->exclude_devs,   // parameter #13
+            use_comp_sz,        // parameter #14
+            use_lilo_sz,        // parameter #15
+            use_star_sz,        // parameter #16
+            bkpinfo->internal_tape_block_size,  // parameter #17 (LONG)
+            bkpinfo->differential,  // parameter #18 (INT)
+            use_gzip_sz,        // parameter #19 (STRING)
+            use_lzma_sz,        // parameter #20 (STRING)
             MONDO_LOGFILE);
 
     mr_free(tmp2);
-    mr_free(last_filelist_number);
     mr_free(tape_device);
     mr_free(use_lzo_sz);

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

@@ -671 +671 @@
         mr_free(bkpinfo->kernel_path);
         mr_asprintf(bkpinfo->kernel_path, "%s", flag_val['k']);
-        if (!strcmp(bkpinfo->kernel_path, "failsafe")) {
-            mr_free(bkpinfo->kernel_path);
-            mr_asprintf(bkpinfo->kernel_path, "FAILSAFE");
-        }
-        if (strcmp(bkpinfo->kernel_path, "FAILSAFE") && !does_file_exist(bkpinfo->kernel_path)) {
+        if (!does_file_exist(bkpinfo->kernel_path)) {
             retval++;
             log_to_screen("You specified kernel '%s', which does not exist\n", bkpinfo->kernel_path);

branches/2.2.10/mondo/src/common/libmondo-devices.c

@@ -2731 +2731 @@
                 paranoid_fclose(fin);
             } else {
-                if (does_file_exist("/tmp/mondo-restore.cfg")) {
+                if (does_file_exist(MINDI_CACHE"/mondorestore.cfg")) {
                     mr_free(bkpinfo->media_device);
-                    bkpinfo->media_device = read_cfg_var("/tmp/mondo-restore.cfg", "media-dev");
+                    bkpinfo->media_device = read_cfg_var(MINDI_CACHE"/mondorestore.cfg", "media-dev");
                 }
             }
@@ -3075 +3075 @@
             ("Will you want to verify your backups after Mondo has created them?");
 
-#ifndef __FreeBSD__
-        if (!ask_me_yes_or_no
-            ("Are you confident that your kernel is a sane, sensible, standard Linux kernel? Say 'no' if you are using a Gentoo <1.4 or Debian <3.0, please."))
-#endif
-        {
-            mr_free(bkpinfo->kernel_path);
-            mr_asprintf(bkpinfo->kernel_path, "FAILSAFE");
-        }
-
         if (!ask_me_yes_or_no
             ("Are you sure you want to proceed? Hit 'no' to abort.")) {

branches/2.2.10/mondo/src/common/libmondo-filelist.c

@@ -322 +322 @@
     mr_free(biggie_fname);
 
-    mr_asprintf(outfname, "%s/LAST-FILELIST-NUMBER", bkpinfo->tmpdir);
-    mr_asprintf(tmp, "%ld", curr_set_no);
-    if (write_one_liner_data_file(outfname, tmp)) {
-        log_OS_error
-            ("Unable to echo write one-liner to LAST-FILELIST-NUMBER");
-        err = 1;
-    }
+    mr_asprintf(tmp, "echo 'last-filelist-number %ld' >> "MINDI_CACHE"/mondorestore.cfg", curr_set_no);
+    paranoid_system(tmp);
     mr_free(tmp);
-    mr_free(outfname);
 
     if (curr_set_no == 0) {
@@ -708 +702 @@
     assert(bkpinfo != NULL);
 
-    mr_asprintf(cfg_fname, "%s/mondo-restore.cfg", bkpinfo->tmpdir);
+    mr_asprintf(cfg_fname, "%s/mondorestore.cfg", MINDI_CACHE);
     val_sz = read_cfg_var(cfg_fname, "last-filelist-number");
     mr_free(cfg_fname);

branches/2.2.10/mondo/src/common/libmondo-files.c

@@ -705 +705 @@
 
 /**
- * Determine the size (in KB) of @p dev in the mountlist in <tt>tmpdir</tt>/mountlist.txt.
+ * Determine the size (in KB) of @p dev in the mountlist in mountlist.txt.
  * @param tmpdir The tempdir where the mountlist is stored.
  * @param dev The device to search for.
@@ -717 +717 @@
     long file_len_K;
 
-    mr_asprintf(mountlist, "%s/mountlist.txt", tmpdir);
-    mr_asprintf(command, "grep \"%s \" %s/mountlist.txt | head -n1 | awk '{print $4}'", dev, tmpdir);
+    mr_asprintf(mountlist, "%s/mountlist.txt", MINDI_CACHE);
+    mr_asprintf(command, "grep \"%s \" %s/mountlist.txt | head -n1 | awk '{print $4}'", dev, MINDI_CACHE);
     mr_free(mountlist);
 
@@ -992 +992 @@
  * Copy the files that Mondo/Mindi need to run to the scratchdir or tempdir.
  * Currently this includes: copy Mondo's home directory to scratchdir, 
- * copy LAST-FILELIST-NUMBER to scratchdir, copy post-nuke.tgz (if it exists) to tmpdir, 
+ * copy post-nuke.tgz (if it exists) to tmpdir, 
  * and run "hostname > scratchdir/HOSTNAME".
  * @param bkpinfo The backup information structure. Fields used:
@@ -1020 +1020 @@
     if (res) {
         fatal_error("Failed to copy Mondo's stuff to scratchdir");
-    }
-
-    mr_asprintf(command, "cp -f %s/LAST-FILELIST-NUMBER %s", bkpinfo->tmpdir, bkpinfo->scratchdir);
-    res = run_program_and_log_output(command, FALSE);
-    mr_free(command);
-
-    if (res) {
-        fatal_error("Failed to copy LAST-FILELIST-NUMBER to scratchdir");
     }
 

branches/2.2.10/mondo/src/common/libmondo-stream.c

@@ -856 +856 @@
     (void) getcwd(old_cwd, MAX_STR_LEN);
     chdir(bkpinfo->tmpdir);
-    mr_asprintf(tmp, "tar -zxf %s ./tmp/mondo-restore.cfg 2> /dev/null", outfname);
+    mr_asprintf(tmp, "tar -zxf %s ."MINDI_CACHE"/mondorestore.cfg 2> /dev/null", outfname);
     paranoid_system(tmp);
     mr_free(tmp);
 
-    paranoid_system("cp -f tmp/mondo-restore.cfg . 2> /dev/null");
+    paranoid_system("cp -f ."MINDI_CACHE"/mondorestore.cfg . 2> /dev/null");
     chdir(old_cwd);
     unlink(outfname);

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

@@ -1071 +1071 @@
 /**
  * Retrieve the line containing @p label from the config file.
- * @param config_file The file to read from, usually @c /tmp/mondo-restore.cfg.
+ * @param config_file The file to read from, usually @c mondorestore.cfg.
  * @param label What to read from the file.
  * @param value Where to put it.
@@ -1294 +1294 @@
  * Write a line to a configuration file. Writes a line of the form,
  * @c label @c value.
- * @param config_file The file to write to. Usually @c mondo-restore.cfg.
+ * @param config_file The file to write to. Usually @c mondorestore.cfg.
  * @param label What to call this bit of data you're writing.
  * @param value The bit of data you're writing.

branches/2.2.10/mondo/src/common/mondostructures.h

@@ -557 +557 @@
 
   /**
-   * Path to the user's kernel, or "FAILSAFE" or "SUCKS" to use the kernel
-   * included with Mindi.
+   * Path to the user's kernel included with Mindi.
    */
     char *kernel_path;