Changeset 756 in MondoRescue

Timestamp:

Aug 7, 2006, 1:16:48 AM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r754:755 $SVN_M/branches/stable

Location:

branches/2.0.9

Files:

• mindi/mindi (modified) (1 diff)
• mondo-doc/distributions/rpm/mondo-doc.spec (modified) (2 diffs)
• mondo/mondo/common/libmondo-files.c (modified) (2 diffs)
• tools/build2pkg (modified) (2 diffs)
• tools/build2qemu (modified) (2 diffs)
• tools/common-env (modified) (1 diff)
• tools/file2ftp (modified) (1 diff)
• tools/pkg2ftp (modified) (2 diffs)
• tools/pkg2mdv (modified) (1 diff)
• tools/svn2build (modified) (2 diffs)

branches/2.0.9/mindi/mindi

@@ -1432 +1432 @@
         # the former is then a link to the latter, so we test whether
         # $current_partition is actually such a link or not and set
-        # $current_lvolume accordingly. Note that $current_lvolume may well be an
+        # $current_lvolume accordingly. On Debian you may find more than one answer 
+        # so we remove the one corresponding to /dev/.static
+        # On RedHat even if the device name is different (/dev/mapper/<VG><LV>), the
+        # principle is the same and we need to find the link to it as well.
+        # Note that $current_lvolume may well be an
         # ordinary device. It is just to make sure that we feed the right value
         # into any of the LVM tools if possible.
 
         current_lvolume="$current_partition"
-        if [ $LVM = "v2" ] && [ "`$LVMCMD lvdisplay $current_partition 2> /dev/null`" ]; then
-            partition_stub="`echo "$current_partition" | sed "s|^/dev/mapper/|/dev/|" | cut -d"-" -f1`"
-            current_lvolume="`find /dev -lname "$current_partition" | grep "^$partition_stub"`"
-        fi
-        #
-        # For ReHat lvmdisplay doesn't work on /dev/mapper entries
-        #
         if [ $LVM = "v2" ] && [ "`echo $current_partition | grep '/dev/mapper/'`" ]; then
-            current_lvolume="`find /dev -lname "$current_partition"`"
+            # .static dir are a Debian specificity
+            current_lvolume="`find /dev -lname "$current_partition" | grep -v /.static/`"
+            echo $current_lvolume | grep -q ' '
+            if [ $? -eq 0]; then
+                echo "WARNING: Multiple Logical Volumes found. Report to dev team" >> $LOGFILE  
+            fi
         fi
         # 

branches/2.0.9/mondo-doc/distributions/rpm/mondo-doc.spec

@@ -32 +32 @@
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-%{__make} -f Makefile.man install INSTALLDIR=${RPM_BUILD_ROOT}/${RPM_DOC_DIR}/%{name}-%{version}
-%{__make} -f Makefile.howto install INSTALLDIR=${RPM_BUILD_ROOT}/${RPM_DOC_DIR}/%{name}-%{version}
+%{__make} -f Makefile.man install INSTALLDIR=${RPM_BUILD_ROOT}/%{_defaultdocdir}/%{name}-%{version}
+%{__make} -f Makefile.howto install INSTALLDIR=${RPM_BUILD_ROOT}/%{_defaultdocdir}/%{name}-%{version}
 
 %clean
@@ -40 +40 @@
 %files
 %defattr(-,root,root)
-%doc svn.log
-%doc mindi.8 mondoarchive.8 mondorestore.8
-%doc mindi.8.html mindi.8.txt mindi.8.ps mindi.8.pdf
-%doc mondoarchive.8.html mondoarchive.8.txt mondoarchive.8.ps mondoarchive.8.pdf
-%doc mondorestore.8.html mondorestore.8.txt mondorestore.8.ps mondorestore.8.pdf
-%doc mondorescue-howto.html mondorescue-howto.pdf mondorescue-howto.ps mondorescue-howto.rtf mondorescue-howto.txt mondorescue-howto/ images/
+%doc %{_defaultdocdir}/%{name}-%{version}
 
 %changelog

branches/2.0.9/mondo/mondo/common/libmondo-files.c

@@ -1214 +1214 @@
 
     /*@ buffers ******** */
-    char outfile[MAX_STR_LEN];
     char nfs_dev[MAX_STR_LEN];
     char nfs_mount[MAX_STR_LEN];
@@ -1227 +1226 @@
     /*@ pointers ***** */
     char *p;
-    FILE *fout;
-
-
 
     log_it("Storing NFS configuration");

branches/2.0.9/tools/build2pkg

@@ -8 +8 @@
 #
 
-umask 022
+exec > /tmp/build2pkg.log 2>&1
+
 dname=`dirname $0`
 prem=`echo $dname |cut -c1`
@@ -98 +99 @@
     elif [  _"$dtype" = _"ebuild" ]; then
         log=$TMP/$p-gentoo.log
-        tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$p-${VER}.ebuild
+        tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$p-${PVER}.ebuild
         if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
             echo "Adding $TOPBUILDDIR/portage to /etc/make.conf"

branches/2.0.9/tools/build2qemu

@@ -13 +13 @@
 # Syntax: build2qemu [version-tag [vm1]..|vmx]]
 
-umask 022
+exec > /tmp/build2qemu.log 2>&1
+
 dname=`dirname $0`
 prem=`echo $dname |cut -c1`
@@ -82 +83 @@
         sleep 300
     fi
-    scp -P $sp $TMP/mkmondo.tar.gz bruno@localhost:
+    scp -P $sp $TMP/mkmondo.tar.gz ~/.rpmmacros ~/.rpmrc bruno@localhost:
     rdate=`date "+%m%d%H%M"`
     ssh -p $sp root@localhost "date $rdate"

branches/2.0.9/tools/common-env

@@ -11 +11 @@
 mkdir -p ${TOPDIR}
 export TMPDIR=/tmp
-export TMP=`mktemp -d`
+export TMP=`mktemp -d tmp.XXXXXXXXXX`
 
 umask 022

branches/2.0.9/tools/file2ftp

@@ -5 +5 @@
 # $Id$
 #
+
+exec > /tmp/file2ftp.log 2>&1
 
 dname=`dirname $0`

branches/2.0.9/tools/pkg2ftp

@@ -5 +5 @@
 # $Id$
 #
+
+exec > /tmp/pkg2ftp.log 2>&1
 
 dname=`dirname $0`
@@ -59 +61 @@
         spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv${suf}.src.rpm"
     elif [  _"$dtype" = "_deb" ]; then
-        pkg="$pkg ${TOPBUILDDIR}/$p_*.rpm"
+        pkg="$pkg ${TOPBUILDDIR}/$p_*.deb"
         spkg="$spkg ${TOPBUILDDIR}/$p_*.dsc ${TOPBUILDDIR}/$p_*.tar.gz"
     fi

branches/2.0.9/tools/pkg2mdv

@@ -5 +5 @@
 # $Id$
 #
+
+exec > /tmp/pkg2mdv.log 2>&1
 
 dname=`dirname $0`

branches/2.0.9/tools/svn2build

@@ -5 +5 @@
 # $Id$
 #
+
+exec > /tmp/svn2build.log 2>&1
 
 dname=`dirname $0`
@@ -136 +138 @@
     # Finally creates the tar files
     echo "Creating $p tar files"
-    tar cfphz ${DEST}/$p-$v-$TAG.tar.gz $dest
+    tar cfphz ${DEST}/$p-$v.tar.gz $dest
     #gzip -cd ${DEST}/$p-$v-$TAG.tar.gz | bzip2 -c3 > ${DEST}/$p-$v-$TAG.tar.bz2
     #tar cfhj ${DEST}/$p-$v-$TAG.tar.bz2 $dest