Changeset 541 in MondoRescue for branches/stable/mondo/mondo/common/libmondo-archive.c

Timestamp:

May 13, 2006, 8:47:23 PM (18 years ago)

Author:

bcornec

Message:

Stable is reverted to r436 (2.0.7) to put it in line with 2.0.8 and start from there over

File:

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

branches/stable/mondo/mondo/common/libmondo-archive.c

@@ -179 +179 @@
 #include "libmondo-devices-EXT.h"
 #include "libmondo-tools-EXT.h"
-#include "newt-specific-EXT.h"
+#include "libmondo-gui-EXT.h"
 #include "libmondo-fork-EXT.h"
 #include "libmondo-files-EXT.h"
@@ -186 +186 @@
 #include "libmondo-verify-EXT.h"
 #include "libmondo-archive.h"
+#include "lib-common-externs.h"
 #include <sys/sem.h>
 #include <sys/types.h>
@@ -580 +581 @@
  * @ingroup archiveGroup
  */
-int backup_data(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
+int backup_data(struct s_bkpinfo *bkpinfo)
 {
     int retval = 0, res = 0;
@@ -643 +644 @@
     sprintf(tmp, "rm -f %s/images/*.iso", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, 1);
-    retval += make_those_afios_phase(bkpinfo,mrconf);   // backup regular files
+    retval += make_those_afios_phase(bkpinfo);  // backup regular files
     retval += make_those_slices_phase(bkpinfo); // backup BIG files
     retval += do_that_final_phase(bkpinfo); // clean up
@@ -1014 +1015 @@
     if (!res) {
         log_to_screen("Boot+data disks were created OK");
-        sprintf(command, "mkdir -p /var/cache/mindi/");
+        sprintf(command, "mkdir -p /root/images/mindi/");
         log_msg(2, command);
         run_program_and_log_output(command, FALSE);
         sprintf(command,
-                "cp -f %s/images/mindi.iso /var/cache/mindi/mondorescue.iso",
+                "cp -f %s/images/mindi.iso /root/images/mindi/mondorescue.iso",
                 bkpinfo->scratchdir);
         log_msg(2, command);
@@ -1252 +1253 @@
  * @ingroup MLarchiveGroup
  */
-int do_that_final_phase(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
+int do_that_final_phase(struct s_bkpinfo *bkpinfo)
 {
 
@@ -1273 +1274 @@
         /* write final ISO */
     {
-        res = write_final_iso_if_necessary(bkpinfo, mrconf);
+        res = write_final_iso_if_necessary(bkpinfo);
         retval += res;
         if (res) {
@@ -1563 +1564 @@
  * @return The number of errors encountered (0 for success)
  */
-int make_afioballs_and_images(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
+int make_afioballs_and_images(struct s_bkpinfo *bkpinfo)
 {
 
@@ -1619 +1620 @@
     log_to_screen("Archiving regular files");
     log_msg(5, "Go, Shorty. It's your birthday.");
-    open_progress_form(_("Backing up filesystem"),
-                       _("I am backing up your live filesystem now."),
-                       _("Please wait. This may take a couple of hours."),
-                       _("Working..."),
+    open_progress_form("Backing up filesystem",
+                       "I am backing up your live filesystem now.",
+                       "Please wait. This may take a couple of hours.",
+                       "Working...",
                        get_last_filelist_number(bkpinfo) + 1);
 
@@ -1707 +1708 @@
             } else {
                 res =
-                    move_files_to_cd(bkpinfo, mrconf, storing_filelist_fname,
+                    move_files_to_cd(bkpinfo, storing_filelist_fname,
                                      curr_xattr_list_fname,
                                      curr_acl_list_fname,
@@ -1785 +1786 @@
  * @return The number of errors encountered (0 for success)
  */
-int make_iso_fs(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *destfile)
+int make_iso_fs(struct s_bkpinfo *bkpinfo, char *destfile)
 {
     /*@ int ********************************************** */
@@ -1848 +1849 @@
     tmp3 = NULL;
     if (bkpinfo->backup_media_type == iso && bkpinfo->manual_cd_tray) {
-        popup_and_OK(_("Please insert new media and press Enter."));
+        popup_and_OK("Please insert new media and press Enter.");
     }
 
@@ -2005 +2006 @@
 #ifdef __IA64__
                 log_msg(1, "IA64 --> elilo");
-                asprintf(&tmp2,"mkisofs -no-emul-boot -b images/mindi-bootroot.%s.img -c boot.cat -o _ISO_ -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .", mrconf->ia64_boot_size);
                 res = eval_call_to_make_ISO(bkpinfo,
                                             //-b images/mindi-boot.2880.img
-                                            tmp2,
+                                            "mkisofs -no-emul-boot -b images/mindi-bootroot."
+                                            IA64_BOOT_SIZE
+                                            ".img -c boot.cat -o _ISO_ -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
                                             destfile,
                                             g_current_media_number,
@@ -2016 +2018 @@
 // FIXME --- change mkisofs string to MONDO_MKISOFS_REGULAR_SYSLINUX/LILO depending on bkpinfo->make_cd_usE_lilo
 // and add ' .' at end
-                paranoid_free(tmp2);
                 log_msg(1, "Non-ia64 --> lilo");
                 res =
@@ -2150 +2151 @@
  */
 int
-make_slices_and_images(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *biggielist_fname)
+make_slices_and_images(struct s_bkpinfo *bkpinfo, char *biggielist_fname)
 {
 
@@ -2223 +2224 @@
         } else {
 // Call ntfsclone (formerly partimagehack) if it's a /dev entry (i.e. a partition to be imaged)
-            log_msg(2, "bigfile_fname = '%s'", bigfile_fname);
+            log_msg(2, "bigfile_fname = %s", bigfile_fname);
             use_ntfsprog = FALSE;
             if (!strncmp(bigfile_fname, "/dev/", 5)
@@ -2269 +2270 @@
             }
             res =
-                slice_up_file_etc(bkpinfo, mrconf, bigfile_fname,
+                slice_up_file_etc(bkpinfo, bigfile_fname,
                                   ntfsprog_fifo, biggie_file_number,
                                   noof_biggie_files, use_ntfsprog);
@@ -2321 +2322 @@
  * @see make_afioballs_and_images
  */
-int make_afioballs_and_images_OLD(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
+int make_afioballs_and_images_OLD(struct s_bkpinfo *bkpinfo)
 {
 
@@ -2349 +2350 @@
     log_to_screen("Archiving regular files");
 
-    open_progress_form(_("Backing up filesystem"),
-                       _("I am backing up your live filesystem now."),
-                       _("Please wait. This may take a couple of hours."),
-                       _("Working..."),
+    open_progress_form("Backing up filesystem",
+                       "I am backing up your live filesystem now.",
+                       "Please wait. This may take a couple of hours.",
+                       "Working...",
                        get_last_filelist_number(bkpinfo) + 1);
 
@@ -2403 +2404 @@
         } else {
             res =
-                move_files_to_cd(bkpinfo, mrconf, curr_filelist_fname,
+                move_files_to_cd(bkpinfo, curr_filelist_fname,
                                  curr_xattr_list_fname,
                                  curr_acl_list_fname, curr_afioball_fname,
@@ -2448 +2449 @@
  * @ingroup MLarchiveGroup
  */
-int make_those_afios_phase(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
+int make_those_afios_phase(struct s_bkpinfo *bkpinfo)
 {
     /*@ int ******************************************* */
@@ -2465 +2466 @@
         log_msg(1,
                 "Using single-threaded make_afioballs_and_images() to suit b0rken FreeBSD 5.0");
-        res = make_afioballs_and_images_OLD(bkpinfo, mrconf);
+        res = make_afioballs_and_images_OLD(bkpinfo);
 #else
-        res = make_afioballs_and_images_OLD(bkpinfo, mrconf);
+        res = make_afioballs_and_images_OLD(bkpinfo);
 #endif
         write_header_block_to_stream(0, "stop-afioballs",
                                      BLK_STOP_AFIOBALLS);
     } else {
-        res = make_afioballs_and_images(bkpinfo, mrconf);
+        res = make_afioballs_and_images(bkpinfo);
     }
 
@@ -2575 +2576 @@
  * transfer files over the network) or leave it as is.
  */
-int (*move_files_to_cd) (struct s_bkpinfo *, struct s_mrconf *mrconf, char *, ...) =
+int (*move_files_to_cd) (struct s_bkpinfo *, char *, ...) =
     _move_files_to_cd;
 
@@ -2596 +2597 @@
  * @return The number of errors encountered (0 for success)
  */
-int _move_files_to_cd(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *files_to_add, ...)
+int _move_files_to_cd(struct s_bkpinfo *bkpinfo, char *files_to_add, ...)
 {
 
@@ -2635 +2636 @@
     }
     if (would_occupy / 1024 > bkpinfo->media_size[g_current_media_number]) {
-        res = write_iso_and_go_on(bkpinfo, struct s_mrconf *mrconf, FALSE); /* FALSE because this is not the last CD we'll write */
+        res = write_iso_and_go_on(bkpinfo, FALSE);  /* FALSE because this is not the last CD we'll write */
         retval += res;
         if (res) {
@@ -2685 +2686 @@
  * @c backup_media_type field is used in this function.
  * @param imagesdir The directory containing the floppy images (usually
- * /var/cache/mindi).
+ * /root/images/mindi).
  *
  * @return The number of errors encountered (0 for success)
@@ -2864 +2865 @@
     if (!bkpinfo->nonbootable_backup) {
 #ifdef __FreeBSD__
-        if (!does_file_exist("/var/cache/mindi/mindi-kern.1722.img"))
+        if (!does_file_exist("/root/images/mindi/mindi-kern.1722.img"))
 #else
-        if (!does_file_exist("/var/cache/mindi/mindi-bootroot.1722.img")
-            && !does_file_exist("/var/cache/mindi/mindi-boot.1440.img")
-            && !does_file_exist("/var/cache/mindi/mindi-boot.2880.img")
-            && !does_file_exist("/var/cache/mindi/mindi-boot.5760.img"))
+        if (!does_file_exist("/root/images/mindi/mindi-bootroot.1722.img")
+            && !does_file_exist("/root/images/mindi/mindi-boot.1440.img"))
 #endif
         {
             mvaddstr_and_log_it(g_currentY++, 74, "No Imgs");
-            if (does_file_exist("/var/cache/mindi/mondorescue.iso")) {
+            if (does_file_exist("/root/images/mindi/mondorescue.iso")) {
                 popup_and_OK
-                    ("Boot+data floppy creation failed. However, FYI, you may burn /var/cache/mindi/mondorescue.iso to a CD and boot from that instead if you wish.");
+                    ("Boot+data floppy creation failed. However, FYI, you may burn /root/images/mindi/mondorescue.iso to a CD and boot from that instead if you wish.");
                 res++;
             }
         } else {
-            offer_to_write_floppies(bkpinfo, "/var/cache/mindi");
+            offer_to_write_floppies(bkpinfo, "/root/images/mindi");
             mvaddstr_and_log_it(g_currentY++, 74, "Done.");
         }
@@ -3279 +3278 @@
  */
 int
-slice_up_file_etc(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *biggie_filename,
+slice_up_file_etc(struct s_bkpinfo *bkpinfo, char *biggie_filename,
                   char *ntfsprog_fifo, long biggie_file_number,
                   long noof_biggie_files, bool use_ntfsprog)
@@ -3409 +3408 @@
     } else {
         res =
-            move_files_to_cd(bkpinfo, mrconf,
+            move_files_to_cd(bkpinfo,
                              slice_fname(biggie_file_number, 0,
                                          bkpinfo->tmpdir, ""), NULL);
@@ -3511 +3510 @@
             res = move_files_to_stream(bkpinfo, file_to_archive, NULL);
         } else {
-            res = move_files_to_cd(bkpinfo, mrconf, file_to_archive, NULL);
+            res = move_files_to_cd(bkpinfo, file_to_archive, NULL);
         }
         retval += res;
@@ -3603 +3602 @@
  * however, this occurs rarely.
  */
-int write_final_iso_if_necessary(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
+int write_final_iso_if_necessary(struct s_bkpinfo *bkpinfo)
 {
     /*@ int ***************************************************** */
@@ -3624 +3623 @@
     }
 #endif
-    res = write_iso_and_go_on(bkpinfo, struct s_mrconf *mrconf, TRUE);
+    res = write_iso_and_go_on(bkpinfo, TRUE);
 #ifndef _XWIN
     if (!g_text_mode) {
@@ -3653 +3652 @@
  * @see make_iso_fs
  */
-int write_iso_and_go_on(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, bool last_cd)
+int write_iso_and_go_on(struct s_bkpinfo *bkpinfo, bool last_cd)
 {
     /*@ pointers **************************************************** */
@@ -3729 +3728 @@
             g_current_media_number);
     for (that_one_was_ok = FALSE; !that_one_was_ok;) {
-        res = make_iso_fs(bkpinfo, mrconf, isofile);
+        res = make_iso_fs(bkpinfo, isofile);
         if (g_current_media_number == 1 && !res
             && (bkpinfo->backup_media_type == cdr
@@ -4031 +4030 @@
 setenv("MONDO_SHARE", MONDO_SHARE, 1);
 }
-
-void mrarchive_init_conf(struct s_mrconf *mrconf) {
-    char *command = NULL;
-    FILE *conffd = NULL;
-    FILE *fin = NULL;
-    int n = 0;
-    char *param = NULL;
-
-    mrconf = (struct s_mrconf *)malloc(sizeof(struct s_mrconf));
-    if (mrconf == NULL) {
-            fatal_error("Unable to malloc mrconf");
-    }
-    /* Default for everything int : 0 char * : NULL */
-
-    /* mindi conf parameters also needed in mondo */
-    mrconf->ia64_boot_size = 0;
-
-    asprintf(&command, "mindi -printvar IA64_BOOT_SIZE");
-    fin = popen(command, "r");
-    getline(&param, &n, fin);
-    pclose(fin);
-    paranoid_free(command);
-    mrconf->ia64_boot_size = atoi(param);
-    paranoid_free(param);
-
-    mrconf->iso_creation_cmd = NULL;
-
-    /* Finds mondo conf file */
-    mrconf_open(MONDO_CONF_DIR"/mondo.conf");
-
-    /* mondo conf parameters needed */
-    mrconf->iso_creation_cmd = mrconf_sread(iso_creation_cmd);
-
-    mrconf_close();