Changeset 539 in MondoRescue for trunk/mondo/mondo

Timestamp:

May 13, 2006, 7:38:44 PM (18 years ago)

Author:

bcornec

Message:

merge -r 534:538 $SVN_M/branches/stable

Location:

trunk/mondo/mondo

Files:

• common/Makefile.am (modified) (1 diff)
• common/libmondo-archive-EXT.h (modified) (1 diff)
• common/libmondo-archive.c (modified) (31 diffs)
• common/libmondo-archive.h (modified) (1 diff)
• common/libmondo-filelist.c (modified) (2 diffs)
• common/libmondo-tools.c (modified) (3 diffs)
• common/mondostructures.h (modified) (1 diff)
• common/my-stuff.h (modified) (8 diffs)
• mondoarchive/main.c (modified) (4 diffs)
• mondorestore/mondo-rstr-newt.c (modified) (1 diff)

trunk/mondo/mondo/common/Makefile.am

@@ -9 +9 @@
 libmondo_a_SOURCES  = libmondo-archive.c libmondo-devices.c libmondo-fifo.c \
                        libmondo-filelist.c libmondo-files.c libmondo-fork.c \
-                       libmondo-mountlist.c libmondo-raid.c \
+                       libmondo-mountlist.c libmondo-raid.c libmondo-msg.c \
                        libmondo-stream.c libmondo-string.c libmondo-tools.c \
                        libmondo-verify.c newt-specific.c \

trunk/mondo/mondo/common/libmondo-archive-EXT.h

@@ -15 +15 @@
 extern int make_slices_and_images(struct s_bkpinfo *bkpinfo,
                                   char *biggielist_fname);
-extern int make_iso_fs(struct s_bkpinfo *bkpinfo, char *destfile);
+extern int make_iso_fs(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *destfile);
 extern int make_afioballs_and_images(struct s_bkpinfo *bkpinfo);
 extern int (*move_files_to_cd) (struct s_bkpinfo *, char *, ...);

trunk/mondo/mondo/common/libmondo-archive.c

@@ -419 +419 @@
  * @ingroup archiveGroup
  */
-int backup_data(struct s_bkpinfo *bkpinfo)
+int backup_data(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
 {
     int retval = 0, res = 0;
@@ -485 +485 @@
     run_program_and_log_output(tmp, 1);
     paranoid_free(tmp);
-    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
@@ -876 +875 @@
     if (!res) {
         log_to_screen("Boot+data disks were created OK");
-        asprintf(&command, "mkdir -p /root/images/mindi/");
+        asprintf(&command, "mkdir -p /var/cache/mindi/");
         log_msg(2, command);
         run_program_and_log_output(command, FALSE);
@@ -882 +881 @@
 
         asprintf(&command,
-                 "cp -f %s/images/mindi.iso /root/images/mindi/mondorescue.iso",
+                 "cp -f %s/images/mindi.iso /var/cache/mindi/mondorescue.iso",
                  bkpinfo->scratchdir);
         log_msg(2, command);
@@ -1107 +1106 @@
  * @ingroup MLarchiveGroup
  */
-int do_that_final_phase(struct s_bkpinfo *bkpinfo)
+int do_that_final_phase(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
 {
 
@@ -1126 +1125 @@
     } else {
         /* write final ISO */
-        res = write_final_iso_if_necessary(bkpinfo);
+        res = write_final_iso_if_necessary(bkpinfo, mrconf);
         retval += res;
         if (res) {
@@ -1406 +1405 @@
  * @return The number of errors encountered (0 for success)
  */
-int make_afioballs_and_images(struct s_bkpinfo *bkpinfo)
+int make_afioballs_and_images(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
 {
 
@@ -1548 +1547 @@
                                          NULL);
             } else {
-                res = move_files_to_cd(bkpinfo, storing_filelist_fname,
-                                       curr_xattr_list_fname,
-                                       curr_acl_list_fname,
-                                       storing_afioball_fname, NULL);
+                res =
+                    move_files_to_cd(bkpinfo, mrconf, storing_filelist_fname,
+                                     curr_xattr_list_fname,
+                                     curr_acl_list_fname,
+                                     storing_afioball_fname, NULL);
             }
             paranoid_free(storing_filelist_fname);
@@ -1628 +1628 @@
  * @return The number of errors encountered (0 for success)
  */
-int make_iso_fs(struct s_bkpinfo *bkpinfo, char *destfile)
+int make_iso_fs(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *destfile)
 {
     /*@ int ********************************************** */
@@ -1822 +1822 @@
 #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,
-                                            "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#_ .",
+                                            tmp2,
                                             destfile,
                                             g_current_media_number,
@@ -1833 +1832 @@
 // 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 = eval_call_to_make_ISO(bkpinfo,
@@ -1956 +1956 @@
  */
 int
-make_slices_and_images(struct s_bkpinfo *bkpinfo, char *biggielist_fname)
+make_slices_and_images(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *biggielist_fname)
 {
 
@@ -2029 +2029 @@
         } 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)
@@ -2076 +2076 @@
             }
             res =
-                slice_up_file_etc(bkpinfo, bigfile_fname,
+                slice_up_file_etc(bkpinfo, mrconf, bigfile_fname,
                                   ntfsprog_fifo, biggie_file_number,
                                   noof_biggie_files, use_ntfsprog);
@@ -2125 +2125 @@
  * @see make_afioballs_and_images
  */
-int make_afioballs_and_images_OLD(struct s_bkpinfo *bkpinfo)
+int make_afioballs_and_images_OLD(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
 {
 
@@ -2198 +2198 @@
             res = move_files_to_stream(bkpinfo, curr_afioball_fname, NULL);
         } else {
-            res = move_files_to_cd(bkpinfo, curr_filelist_fname,
-                                   curr_xattr_list_fname,
-                                   curr_acl_list_fname,
-                                   curr_afioball_fname, NULL);
+            res =
+                move_files_to_cd(bkpinfo, mrconf, curr_filelist_fname,
+                                 curr_xattr_list_fname,
+                                 curr_acl_list_fname, curr_afioball_fname,
+                                 NULL);
         }
         retval += res;
@@ -2246 +2247 @@
  * @ingroup MLarchiveGroup
  */
-int make_those_afios_phase(struct s_bkpinfo *bkpinfo)
+int make_those_afios_phase(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
 {
     /*@ int ******************************************* */
@@ -2263 +2264 @@
         log_msg(1,
                 "Using single-threaded make_afioballs_and_images() to suit b0rken FreeBSD 5.0");
-        res = make_afioballs_and_images_OLD(bkpinfo);
+        res = make_afioballs_and_images_OLD(bkpinfo, mrconf);
 #else
-        res = make_afioballs_and_images_OLD(bkpinfo);
+        res = make_afioballs_and_images_OLD(bkpinfo, mrconf);
 #endif
         write_header_block_to_stream(0, "stop-afioballs",
                                      BLK_STOP_AFIOBALLS);
     } else {
-        res = make_afioballs_and_images(bkpinfo);
+        res = make_afioballs_and_images(bkpinfo, mrconf);
     }
 
@@ -2376 +2377 @@
  * transfer files over the network) or leave it as is.
  */
-int (*move_files_to_cd) (struct s_bkpinfo *, char *, ...) =
+int (*move_files_to_cd) (struct s_bkpinfo *, struct s_mrconf *mrconf, char *, ...) =
     _move_files_to_cd;
 
@@ -2397 +2398 @@
  * @return The number of errors encountered (0 for success)
  */
-int _move_files_to_cd(struct s_bkpinfo *bkpinfo, char *files_to_add, ...)
+int _move_files_to_cd(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *files_to_add, ...)
 {
 
@@ -2436 +2437 @@
     if (would_occupy / 1024 > bkpinfo->media_size[g_current_media_number]) {
         /* FALSE because this is not the last CD we'll write */
-        res = write_iso_and_go_on(bkpinfo, FALSE);
+        res = write_iso_and_go_on(bkpinfo, mrconf, FALSE);
         retval += res;
         if (res) {
@@ -2480 +2481 @@
  * @c backup_media_type field is used in this function.
  * @param imagesdir The directory containing the floppy images (usually
- * /root/images/mindi).
+ * /var/cache/mindi).
  *
  * @return The number of errors encountered (0 for success)
@@ -2653 +2654 @@
     if (!bkpinfo->nonbootable_backup) {
 #ifdef __FreeBSD__
-        if (!does_file_exist("/root/images/mindi/mindi-kern.1722.img"))
+        if (!does_file_exist("/var/cache/mindi/mindi-kern.1722.img"))
 #else
-        if (!does_file_exist("/root/images/mindi/mindi-bootroot.1722.img")
-            && !does_file_exist("/root/images/mindi/mindi-boot.1440.img"))
+        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"))
 #endif
         {
             mvaddstr_and_log_it(g_currentY++, 74, "No Imgs");
-            if (does_file_exist("/root/images/mindi/mondorescue.iso")) {
+            if (does_file_exist("/var/cache/mindi/mondorescue.iso")) {
                 popup_and_OK
-                    ("Boot+data floppy creation failed.\nHowever, you may burn /root/images/mindi/mondorescue.iso to a CD\nand boot from that instead if you wish.");
+                    ("Boot+data floppy creation failed.\nHowever, you may burn /var/cache/mindi/mondorescue.iso to a CD\nand boot from that instead if you wish.");
                 res++;
             }
         } else {
-            offer_to_write_floppies(bkpinfo, "/root/images/mindi");
+            offer_to_write_floppies(bkpinfo, "/var/cache/mindi");
             mvaddstr_and_log_it(g_currentY++, 74, "Done.");
         }
@@ -3004 +3007 @@
  */
 int
-slice_up_file_etc(struct s_bkpinfo *bkpinfo, char *biggie_filename,
+slice_up_file_etc(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *biggie_filename,
                   char *ntfsprog_fifo, long biggie_file_number,
                   long noof_biggie_files, bool use_ntfsprog)
@@ -3127 +3130 @@
                                                bkpinfo->tmpdir, ""), NULL);
     } else {
-        res = move_files_to_cd(bkpinfo,
-                               slice_fname(biggie_file_number, 0,
-                                           bkpinfo->tmpdir, ""), NULL);
+        res =
+            move_files_to_cd(bkpinfo, mrconf,
+                             slice_fname(biggie_file_number, 0,
+                                         bkpinfo->tmpdir, ""), NULL);
     }
     i = bkpinfo->optimal_set_size / 256;
@@ -3243 +3247 @@
             res = move_files_to_stream(bkpinfo, file_to_archive, NULL);
         } else {
-            res = move_files_to_cd(bkpinfo, file_to_archive, NULL);
+            res = move_files_to_cd(bkpinfo, mrconf, file_to_archive, NULL);
         }
         paranoid_free(file_to_archive);
@@ -3339 +3343 @@
  * however, this occurs rarely.
  */
-int write_final_iso_if_necessary(struct s_bkpinfo *bkpinfo)
+int write_final_iso_if_necessary(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
 {
     /*@ int ***************************************************** */
@@ -3362 +3366 @@
 #endif
     paranoid_free(tmp);
-    res = write_iso_and_go_on(bkpinfo, TRUE);
+    res = write_iso_and_go_on(bkpinfo, mrconf, TRUE);
 #ifndef _XWIN
     if (!g_text_mode) {
@@ -3390 +3394 @@
  * @see make_iso_fs
  */
-int write_iso_and_go_on(struct s_bkpinfo *bkpinfo, bool last_cd)
+int write_iso_and_go_on(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, bool last_cd)
 {
     /*@ pointers **************************************************** */
@@ -3468 +3472 @@
              g_current_media_number);
     for (that_one_was_ok = FALSE; !that_one_was_ok;) {
-        res = make_iso_fs(bkpinfo, isofile);
+        res = make_iso_fs(bkpinfo, mrconf, isofile);
         if (g_current_media_number == 1 && !res
             && (bkpinfo->backup_media_type == cdr
@@ -3753 +3757 @@
 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();

trunk/mondo/mondo/common/libmondo-archive.h

@@ -17 +17 @@
 int make_slices_and_images(struct s_bkpinfo *bkpinfo,
                            char *biggielist_fname);
-int make_iso_fs(struct s_bkpinfo *bkpinfo, char *destfile);
+int make_iso_fs(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *destfile);
 int make_afioballs_and_images(struct s_bkpinfo *bkpinfo);
 extern int (*move_files_to_cd) (struct s_bkpinfo *, char *, ...);

trunk/mondo/mondo/common/libmondo-filelist.c

@@ -1536 +1536 @@
                        char *userdef_filelist)
 {
-    char sz_datefile_wildcard[] = "/var/cache/mondo-archive/difflevel.%d";
+    char sz_datefile_wildcard[] = "/var/cache/mondo/difflevel.%d";
     char *p, *q;
     char *sz_datefile;
@@ -1605 +1605 @@
         asprintf(&exclude_paths, " %s %s %s %s %s %s . .. \
 " MNT_CDROM " " MNT_FLOPPY " /media/cdrom /media/cdrecorder \
-/proc /sys /root/images/mondo /root/images/mindi ", excp, call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null"), call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null"), call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null"), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
+/proc /sys /tmp /var/cache/mondo /var/cache/mindi", excp, call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null"), call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null"), call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null"), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
 
         log_msg(2, "Excluding paths = '%s'", exclude_paths);

trunk/mondo/mondo/common/libmondo-tools.c

@@ -737 +737 @@
         strcpy(bkpinfo->isodir, "/");
     } else {
-        strcpy(bkpinfo->isodir, "/root/images/mondo");
+        strcpy(bkpinfo->isodir, "/var/cache/mondo/iso");
     }
     strcpy(bkpinfo->prefix, STD_PREFIX);
@@ -848 +848 @@
 #endif
 
-    if ((Lres = free_space_on_given_partition("/root")) == -1) {
+    if ((Lres = free_space_on_given_partition("/var/cache/mondo")) == -1) /* {
         Lres = free_space_on_given_partition("/");
     }
+    */
     log_it("Free space on given partition = %ld MB", Lres);
 
     if (Lres < 50) {
-        run_program_and_log_output
-            ("rm -Rf /root/images/mindi; mkdir -p /home/root/images/mindi; mkdir -p /root/images; ln -sf /home/root/images/mindi /root/images/mindi",
-             3);
-        //      fatal_error("Your / (or /root) partition has <50MB free. Please adjust your partition table to something saner."); 
+        fatal_error("Your /var/cache/mondo partition has <50MB free. Please adjust your partition table to something saner."); 
     }
 
@@ -1216 +1214 @@
 }
 
-
-/**
- * The standard log_debug_msg() (log_msg() also due to a macro). Writes some describing
- * information to the logfile.
- */
-void standard_log_debug_msg(int debug_level, const char *szFile,
-                            const char *szFunction, int nLine,
-                            const char *fmt, ...)
-{
-    va_list args;
-    int i;
-    static int depth = 0;
-    FILE *fout;
-
-    if (depth > 5) {
-        depth--;
-        return;
-    }
-    depth++;
-
-    if (debug_level <= g_loglevel) {
-        va_start(args, fmt);
-        if (!(fout = fopen(MONDO_LOGFILE, "a"))) {
-            return;
-        }                       // fatal_error("Failed to openout to logfile - sheesh..."); }
-
-        // add tabs to distinguish log levels
-        if (debug_level > 0) {
-            for (i = 1; i < debug_level; i++)
-                fprintf(fout, "\t");
-            if (getpid() == g_main_pid)
-                fprintf(fout, "[Main] %s->%s#%d: ", szFile, szFunction,
-                        nLine);
-            else if (getpid() == g_buffer_pid && g_buffer_pid > 0)
-                fprintf(fout, "[Buff] %s->%s#%d: ", szFile, szFunction,
-                        nLine);
-            else
-                fprintf(fout, "[TH=%d] %s->%s#%d: ", getpid(), szFile,
-                        szFunction, nLine);
-        }
-        vfprintf(fout, fmt, args);
-
-        // do not slow down the progran if standard debug level
-        // must be enabled: if no flush, the log won't be up-to-date if there
-        // is a segfault
-        //if (g_dwDebugLevel != 1)
-
-        va_end(args);
-        fprintf(fout, "\n");
-        paranoid_fclose(fout);
-    }
-    depth--;
-}
-
-/**
- * Function pointer to the @c log_debug_msg function to use. Points to standard_log_debug_msg() by default.
- */
-void (*log_debug_msg) (int, const char *, const char *, int, const char *,
-                       ...) = standard_log_debug_msg;
-
-
 /**
  * Allocate or free important globals, depending on @p mal.

trunk/mondo/mondo/common/mondostructures.h

@@ -784 +784 @@
     struct s_mdrec el[MAXIMUM_RAID_DEVS];
 };
+
+struct s_mrconf {
+    int ia64_boot_size;
+    char *iso_creation_cmd;
+};

trunk/mondo/mondo/common/my-stuff.h

@@ -1 @@
-/* $Id$ */
-
+/*
+ * Common defines across the project
+ *
+ *  $Id$
+ */
+
+#ifndef _MY_STUFF_H_
+#define _MY_STUFF_H_
+
+/* BERLIOS
 #define HAVE_MALLOC 1
+*/
 
 // Extra info for ACLs and SELINUX users
@@ -26 +35 @@
  * Create the illusion of a Boolean type.
  */
-#define bool int
+#define bool unsigned char
 #define TRUE 1
 #define FALSE 0
@@ -34 +43 @@
 #include <config.h>
 #endif
+/* BERLIOS
+ * Useful ?
+*/
 
 #ifndef __FreeBSD__
@@ -47 +59 @@
 
 #include <stdlib.h>
+/* BERLIOS
 #ifndef  __USE_FILE_OFFSET64
 #define  __USE_FILE_OFFSET64
@@ -53 +66 @@
 #define  __USE_LARGEFILE64
 #endif
+*/
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -64 +78 @@
 #include <signal.h>
 #endif
-//#include <curses.h>
 #include <newt.h>
 #include <ctype.h>
@@ -70 +83 @@
 #ifndef S_SPLINT_S
 #include <pthread.h>
-#endif
 #include <assert.h>
 
-#include "../../config.h"
-
+/*
 #if defined(DEBUG) && !__cplusplus
 int count;
-char trace_log[255];            /*buffer for logging */
+char trace_log[255];
 char *trace_log_ptr;
-#endif                          /* DEBUG */
-
-#define IA64_BOOT_SIZE "8192"   /* Should be coherent with mindi */
-#define STD_PREFIX "mondorescue"    /* Should be coherent with mindi */
+#endif
+*/
+
+#define STD_PREFIX "mondorescue"
 
 /**
@@ -129 +140 @@
 #define CRC_M16 0xA001          ///< Mask for crc16.
 #define CRC_MTT 0x1021          ///< Mask for crc-ccitt.
-
-#define FALSE 0                 ///< The ubiquitous FALSE macro.
-#define TRUE 1                  ///< The even more ubiquitous TRUE macro.
 
 #define SCREEN_LENGTH 25        ///< The default size of the screen.

trunk/mondo/mondo/mondoarchive/main.c

@@ -133 +133 @@
 {
     struct s_bkpinfo *bkpinfo;
+    struct s_mrconf *mrconf;
     char *tmp;
     int res = 0;
@@ -160 +161 @@
     malloc_libmondo_global_strings();
 
+    /* Initialize Configuration Structure */
+    mrarchive_init_conf(mrconf);
+
+    res = 0;
+    retval = 0;
     diffs = 0;
     printf(_("Initializing...\n"));
@@ -327 +333 @@
     /* If we're meant to backup then backup */
     if (bkpinfo->backup_data) {
-        res = backup_data(bkpinfo);
+        res = backup_data(bkpinfo, mrconf);
         retval += res;
         if (res) {
@@ -363 +369 @@
     }
 
-    if (does_file_exist("/root/images/mindi/mondorescue.iso")) {
+    if (does_file_exist("/var/cache/mindi/mondorescue.iso")) {
         log_to_screen
-            (_("/root/images/mindi/mondorescue.iso, a boot/utility CD, is available if you want it."));
+            (_("/var/cache/mindi/mondorescue.iso, a boot/utility CD, is available if you want it."));
     }
 

trunk/mondo/mondo/mondorestore/mondo-rstr-newt.c

@@ -2294 +2294 @@
  * @param isodir_device Where to put the device (e.g. /dev/hda4) the user enters.
  * @param isodir_format Where to put the format (e.g. ext2) the user enters.
- * @param isodir_path Where to put the path (e.g. /root/images/mondo) the user enters.
+ * @param isodir_path Where to put the path (e.g. /var/cache/mondo) the user enters.
  * @param nuke_me_please Whether we're planning on nuking or not.
  * @return TRUE if OK was pressed, FALSE otherwise.