Changeset 519 in MondoRescue for branches/2.0.8/mondo

Timestamp:

May 1, 2006, 1:54:31 AM (18 years ago)

Author:

bcornec

Message:

merge -r 437:447 $SVN_M/branches/stable
merge -r 461:464 $SVN_M/branches/stable
merge -r 465:472 $SVN_M/branches/stable
merge -r 473:479 $SVN_M/branches/stable
merge -r 480:488 $SVN_M/branches/stable
merge -r 491:494 $SVN_M/branches/stable
merge -r 508:516 $SVN_M/branches/stable

Location:

branches/2.0.8/mondo

Files:

• configure.in (modified) (1 diff)
• distributions/mandriva/spec.m4 (modified) (1 diff)
• distributions/rpm/changelog (copied) (copied from branches/stable/mondo/distributions/rpm/changelog )
• mondo/common/libmondo-archive-EXT.h (modified) (1 diff)
• mondo/common/libmondo-archive.h (modified) (1 diff)
• mondo/common/libmondo-verify.c (modified) (1 diff)
• mondo/common/mondostructures.h (modified) (2 diffs)
• mondo/mondoarchive/mondo-cli.c (modified) (1 diff)
• mondo/mondorestore/mondo-restore.c (modified) (2 diffs)

branches/2.0.8/mondo/configure.in

@@ -72 +72 @@
         AC_CHECK_LIB(pthread, pthread_create, true, [echo "*** Cannot find -lpthread."; echo "*** Please make sure you have the linuxthreads glibc add-on installed."; exit 1])
         PTHREAD="-lpthread"
-        CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
+        CFLAGS="$CFLAGS -Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
         ;;
     *)

branches/2.0.8/mondo/distributions/mandriva/spec.m4

@@ -8 +8 @@
 define(`GRP', `Archiving/Backup')dnl
 dnl OBS is replaced vy what is being obsoleted
-define(`OBS', Obsoletes:    libmondo <= 2.04)dnl
+define(`OBS', `Obsoletes:   libmondo <= 2.04
+Provides:   libmondo')dnl

branches/2.0.8/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/2.0.8/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/2.0.8/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/2.0.8/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/2.0.8/mondo/mondo/mondoarchive/mondo-cli.c

@@ -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/2.0.8/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,