Changeset 543 in MondoRescue for branches/stable/mondo/mondo

Timestamp:

May 13, 2006, 8:52:38 PM (18 years ago)

Author:

bcornec

Message:

stable is now at same level as 2.0.8 (r538)

Location:

branches/stable/mondo/mondo

Files:

• common/libmondo-archive-EXT.h (modified) (1 diff)
• common/libmondo-archive.h (modified) (1 diff)
• common/libmondo-verify.c (modified) (1 diff)
• common/mondostructures.h (modified) (2 diffs)
• mondoarchive/mondo-cli.c (modified) (3 diffs)
• mondorestore/mondo-restore.c (modified) (2 diffs)

branches/stable/mondo/mondo/common/libmondo-archive-EXT.h

@@ -41 +41 @@
                                           char *filelist, char *fname,
                                           int setno);
-extern void setenv_mondo_lib(void);
+extern void setenv_mondo_share(void);

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

@@ -42 +42 @@
 int archive_this_fileset_with_star(struct s_bkpinfo *bkpinfo,
                                    char *filelist, char *fname, int setno);
-void setenv_mondo_lib(void);
+void setenv_mondo_share(void);

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

@@ -1020 +1020 @@
 
     sprintf(mountpoint, "%s/cdrom", bkpinfo->tmpdir);
-    sprintf(fname, "%s/%s/%s-%d.iso", bkpinfo->nfs_remote_dir,
-            bkpinfo->isodir, bkpinfo->prefix, g_current_media_number);
+    sprintf(fname, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir,
+            bkpinfo->prefix, g_current_media_number);
 
     mkdir(mountpoint, 1777);

branches/stable/mondo/mondo/common/mondostructures.h

@@ -477 +477 @@
    * If you do nothing, "/" will be used.
    */
-    char include_paths[MAX_STR_LEN];
+    char include_paths[MAX_STR_LEN*4];
 
   /**
@@ -484 +484 @@
    * the scratchdir, and the tempdir are automatically excluded.
    */
-    char exclude_paths[MAX_STR_LEN];
+    char exclude_paths[MAX_STR_LEN*4];
 
   /**

branches/stable/mondo/mondo/mondoarchive/mondo-cli.c

@@ -469 +469 @@
         strncpy(bkpinfo->include_paths + strlen(bkpinfo->include_paths),
                 flag_val['I'],
-                MAX_STR_LEN - strlen(bkpinfo->include_paths));
+                4*MAX_STR_LEN - strlen(bkpinfo->include_paths));
         log_msg(1, "include_paths is now '%s'", bkpinfo->include_paths);
         if (bkpinfo->include_paths[0] == '-') {
@@ -704 +704 @@
         strncpy(bkpinfo->exclude_paths + strlen(bkpinfo->exclude_paths),
                 flag_val['E'],
-                MAX_STR_LEN - strlen(bkpinfo->exclude_paths));
+                4*MAX_STR_LEN - strlen(bkpinfo->exclude_paths));
     }
     if (flag_set['e']) {
@@ -918 +918 @@
         &&
         !run_program_and_log_output
-        ("grep -i suse /etc/issue.net | grep 64", TRUE)) {
+        ("egrep -i suse /etc/issue.net | egrep '9.0' | grep 64", TRUE)) {
         bkpinfo->make_cd_use_lilo = TRUE;
         log_to_screen

branches/stable/mondo/mondo/mondorestore/mondo-restore.c

@@ -1977 +1977 @@
                 filelist_name);
         log_msg(2,
-                "This is a bit silly (ask Hugo to fix mondo-makefilelist, please)");
+                "This is a bit silly (ask dev-team to fix mondo-makefilelist, please)");
         log_msg(2,
                 "but it's non-critical. It's cosmetic. Don't worry about it.");
@@ -2054 +2054 @@
             if (filelist_subset_fname[0] != '\0') {
                 sprintf(command,
-                        "afio -i -M 8m -b %ld -c %ld %s -w %s %s",
+                        "afio -i -M 8m -b %ld -c %ld %s -w '%s' %s",
                         TAPE_BLOCK_SIZE,
                         BUFSIZE, executable, filelist_subset_fname,