Changeset 542 in MondoRescue for branches/stable/mindi

Timestamp:

May 13, 2006, 8:48:41 PM (18 years ago)

Author:

bcornec

Message:

merge -r436:517 $SVN_M/branches/2.0.7
stable is now again at 2.0.8 initial

Location:

branches/stable/mindi

Files:

• ChangeLog (modified) (1 diff)
• VERSION (modified) (1 diff)
• distributions/redhat/changelog (copied) (copied from branches/2.0.7/mindi/distributions/redhat/changelog )
• distributions/redhat/spec.m4 (modified) (1 diff)
• distributions/rpm/mindi.spec (modified) (4 diffs)
• distributions/suse/changelog (copied) (copied from branches/2.0.7/mindi/distributions/suse/changelog )
• install.sh (modified) (1 diff)
• mindi (modified) (3 diffs)

branches/stable/mindi/ChangeLog

@@ -3 +3 @@
 MINDI CHANGES
 
-1.07 (2006-02-23)
+1.0.7 (2006-03-10)
+- Fix issue for 2.6 kernels with VIA chipsets (Andree Leidenfrost)
 - stop creating further size of floppy disks if the smaller one succeeds 
   (Bruno Cornec)

branches/stable/mindi/VERSION

@@ -1 @@
-stable
+1.0.7

branches/stable/mindi/distributions/redhat/spec.m4

@@ -2 +2 @@
 dnl
 dnl SSS is replaced by the source package format
-define(`SSS', %{name}-%{version}.tgz)dnl
+define(`SSS', ftp://ftp.mondorescue.org/src/%{name}-%{version}.tgz)dnl
 dnl DDD is replaced by the list of dependencies specific to that distro
 define(`DDD', %{addreqb}, which, grep >= 2.5)dnl
 dnl GRP is replaced by the RPM group of apps
-define(`GRP', Archiving/Archiving)dnl
+define(`GRP', Applications/Archiving)dnl

branches/stable/mindi/distributions/rpm/mindi.spec

@@ -17 +17 @@
 License:    GPL
 Group:      %{grp}
-Url:        http://mondorescue.berlios.de
+Url:        http://www.mondorescue.org
 Source:     %{src}
-BuildRoot:  %{_tmppath}/%{name}-%{version}
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 Requires:   %{addreq}
+Epoch:      %(echo EEE | cut -d- -f1 | sed "s~M~~")
 # Not on all systems
 #Conflicts: bonnie++
@@ -31 +32 @@
 
 %prep
-%{__rm}  -rf $RPM_BUILD_ROOT
 %setup -n %name-%{version}
 
@@ -41 +41 @@
 
 %install
+%{__rm}  -rf $RPM_BUILD_ROOT
 export DONT_RELINK=1
 
-%{__rm} -rf $RPM_BUILD_ROOT
 export PREFIX=${RPM_BUILD_ROOT}%{_exec_prefix}
 export CONFDIR=${RPM_BUILD_ROOT}%{_sysconfdir}
@@ -60 +60 @@
 %files
 %defattr(644,root,root,755)
-%config(noreplace) %{_sysconfdir}/mindi/deplist.txt
+%config(noreplace) %{_sysconfdir}/mindi
+%config(noreplace) %{_sysconfdir}/mindi/deplist.txt 
 %doc ChangeLog INSTALL COPYING README TODO README.ia64 README.pxe README.busybox svn.log
 %{_mandir}/man8/*

branches/stable/mindi/install.sh

@@ -109 +109 @@
 fi
 
+# Special case for SuSE family where doc is put elsewhere in the RPM
+if [ _"$dfam" = _"suse" ]; then
+    rm -rf $DOCDIR
+fi
+
 exit 0

branches/stable/mindi/mindi

@@ -1254 +1254 @@
     if [ $tmpmodprobe_flag == "Y" ] ; then
         infile="/tmp/modprobe.conf.mindi.$$"
-        find /etc/modprobe.d -maxdepth 1 -name "*" -xtype f > $infile
+        find /etc/modprobe.d -maxdepth 1 -name "*" -xtype f -print0 | xargs -0 cat > $infile
     else
         infile="/etc/modules.conf"
@@ -1315 +1315 @@
     if [ -d "/proc/lvm" ] || [ -d "/dev/mapper" ]; then
     echo -en "\rAnalyzing LVM...\r"
-    all_partitions=`$MINDI_LIB/analyze-my-lvm | fgrep ">>>" | cut -d' ' -f2-32`
+    all_partitions=`$MINDI_SBIN/analyze-my-lvm | fgrep ">>>" | cut -d' ' -f2-32`
     fi
     all_partitions="$all_partitions `ListAllPartitions 2> /dev/null`"
@@ -2217 +2217 @@
     cp -f $TMP_ROOT/mountlist.txt $CACHE_LOC
     [ "`DidMondoCallMe`" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MONDO_TMP/.
-    [ -d "/proc/lvm" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
-    [ -d "/dev/mapper" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
+    [ -d "/proc/lvm" ] && $MINDI_SBIN/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
+    [ -d "/dev/mapper" ] && $MINDI_SBIN/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
     cat $minidir_root/$noof_disks/tmp/mountlist.txt >> $LOGFILE
     ZipMinidirsIntoTarballs $minidir_root $tardir $noof_disks