Changeset 1591 in MondoRescue

Timestamp:

Aug 2, 2007, 12:26:40 AM (18 years ago)

Author:

Bruno Cornec

Message:

• Improve tape support doc (Tilman Schmidt <tilman_at_imap.cc>)
• mdadm.conf files added to deplist
• Fix gentoo issues again (Francesco Talamona ti.liame_at_email.it)
• Fix bug #187 (Scott Cummings rsc_at_usfamily.net)

(merge -r1579:1590 $SVN_M/branches/2.2.5)

Location:

branches/stable

Files:

• mindi-busybox/distributions/gentoo/mindi-busybox.ebuild (modified) (1 diff)
• mindi/deplist.txt (modified) (1 diff)
• mindi/distributions/gentoo/mindi.ebuild (modified) (1 diff)
• mindi/rootfs/etc/ld.so.conf (modified) (1 diff)
• mondo-doc/distributions/gentoo/mondo.ebuild (modified) (1 diff)
• mondo-doc/mondorescue-howto.sgml (modified) (3 diffs)
• mondo/distributions/gentoo/mondo-rescue.ebuild (copied) (copied from branches/2.2.5/mondo/distributions/gentoo/mondo-rescue.ebuild )
• mondo/distributions/gentoo/mondo.ebuild (deleted)
• mondo/src/common/libmondo-string.c (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-compare.c (modified) (5 diffs)
• tools/build2pkg (modified) (2 diffs)

branches/stable/mindi-busybox/distributions/gentoo/mindi-busybox.ebuild

@@ -10 +10 @@
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ia64 -*"
+KEYWORDS="~x86 ~ia64 ~amd64 -*"
 DEPEND="virtual/libc"
 RDEPEND=">=app-arch/bzip2-0.9

branches/stable/mindi/deplist.txt

@@ -14 +14 @@
 #-------------------------------- ESSENTIAL -----------------------------------
 fstab raidtab modules.conf conf.modules mondorestore modules.conf.local
+/etc/mdadm/mdadm.conf /etc/mdadm.conf
 afio star ntfsclone parted ms-sys file getfattr setfattr getfacl setfacl
 buffer

branches/stable/mindi/distributions/gentoo/mindi.ebuild

@@ -11 +11 @@
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ia64 -*"
+KEYWORDS="~x86 ~ia64 ~amd64 -*"
 IUSE=""
 

branches/stable/mindi/rootfs/etc/ld.so.conf

@@ -3 +3 @@
 /usr/local/lib
 /usr/X11R6/lib
+/lib32
+/usr/lib32
 /lib64
 /usr/lib64

branches/stable/mondo-doc/distributions/gentoo/mondo.ebuild

@@ -13 +13 @@
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~x86"
+KEYWORDS="~x86 ~ia64 ~amd64 -*"
 IUSE=""
 

branches/stable/mondo-doc/mondorescue-howto.sgml

@@ -612 +612 @@
 your tape streamer with '-d <device>'. You don't usually need
 to but it's good to be on the safe side. Some computers call your
-tape streamer /dev/osst0, some call it /dev/ftape, ...</para>
+tape streamer /dev/osst0, some call it /dev/ftape, ...
+Also, depending on the tape streamer model, a tape should be inserted 
+in the tape drive before starting mondoarchive, otherwise it may not 
+recognize the drive.</para>
 </listitem>
 </itemizedlist>
@@ -728 +731 @@
 fopen(), fread(), fwrite() and fclose() to interact with tape
 drives. That works for most drives but some drives just don't like
-that.</para>
+that.
+Also, depending on the tape streamer model, a tape should be inserted 
+in the tape drive before starting mondoarchive, otherwise it may not 
+recognize the drive.</para>
 <para>Mondo Rescue has been tested thousands of times on various computers.
 It has worked for them.
@@ -2901 +2907 @@
 and defblksize using 'mt', or tweaking Mondo's block size by
 recompiling it with make INTTAPE=4096 or INTTAPE=8192 or something.
-Other than that, you need a priest or a refund.</para>
+Other than that, you need a priest or a refund.
+Also, depending on the tape streamer model, a tape should be inserted 
+in the tape drive before starting mondoarchive, otherwise it may not 
+recognize the drive.</para>
 </answer>
 </qandaentry>

branches/stable/mondo/src/common/libmondo-string.c

@@ -745 +745 @@
         sev = 2;
         mr_asprintf(&reason,
-                 _("It's in your /home partiton. Therefore, it is important."));
+                 _("It's in your /home directory. Therefore, it is important."));
     }
     if (!strncmp(filename, "/usr/", 5)) {

branches/stable/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -298 +298 @@
     if (res) {
         log_OS_error(command);
+        log_msg(2, tmp);
     }
     mr_free(command);
@@ -503 +504 @@
     long q = 0L;
     char *tmp = NULL;
+    char *new = NULL;
+    char *cwd = NULL;
+
+    malloc_string(new);
+    malloc_string(cwd);
 
   /**************************************************************************
@@ -546 +552 @@
                             ("Warning - differences found during the compare phase"));
     }
-
-    retval += unmount_all_devices(mountlist);
 
     if (count_lines_in_file("/tmp/changed.txt") > 0) {
@@ -575 +579 @@
 
             mr_msg(2, "calling popup_changelist_from_file()");
+            getcwd(cwd, MAX_STR_LEN - 1);
+            chdir(bkpinfo->restore_path);
+            getcwd(new, MAX_STR_LEN - 1);
             popup_changelist_from_file("/tmp/changed.files");
             mr_msg(2, "Returning from popup_changelist_from_file()");
+            chdir(cwd);
         }
     } else {
@@ -583 +591 @@
              ("No significant differences were found. Your backup is perfect."));
     }
+    retval += unmount_all_devices(mountlist);
+
     kill_petris();
+    paranoid_free(new);
+    paranoid_free(cwd);
     return (retval);
 }

branches/stable/tools/build2pkg

@@ -103 +103 @@
         cd ..
     elif [  _"$dtype" = _"ebuild" ]; then
-        tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$p-${PVER}.ebuild
+        if [ _"$p" = _"mondo" ]; then
+            eb="mondo-rescue"
+        else
+            eb=$p
+        fi
+        tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$eb-${PVER}.ebuild
         if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
             echo "Adding $TOPBUILDDIR/portage to /etc/make.conf"
@@ -109 +114 @@
         fi
 
-        mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$p
-        mv $p-${PVER}/distributions/${ddir}-$dver/$p-${PVER}.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p/$p-${PVER}.ebuild
+        mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$eb
+        mv $p-${PVER}/distributions/${ddir}-$dver/$eb-${PVER}.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p/$eb-${PVER}.ebuild
         rm -rf $p-${PVER}
 
-        cd ${TOPBUILDDIR}/portage/sys-apps/$p
-        ebuild $p-${PVER}.ebuild digest
+        cd ${TOPBUILDDIR}/portage/sys-apps/$eb
+        ebuild $eb-${PVER}.ebuild digest
         if [ $? != 0 ]; then 
             status=-1
         fi
-        ebuild $p-${PVER}.ebuild package
+        ebuild $eb-${PVER}.ebuild package
         if [ $? != 0 ]; then 
             status=-1
         fi
-        export pkg="$pkg $p-${PVER}.ebuild"
+        export pkg="$pkg $eb-${PVER}.ebuild"
     elif [  _"$dtype" = _"deb" ]; then
         cd $TOPBUILDDIR