Changeset 394 in MondoRescue

Timestamp:

Feb 15, 2006, 11:44:31 AM (18 years ago)

Author:

bcornec

Message:

merge -r387:391 $SVN_M/branches/stable

Location:

trunk

Files:

• documentation/mondorescue-howto.sgml (modified) (3 diffs)
• mindi/distributions/common (deleted)
• mindi/distributions/debian (copied) (copied from branches/stable/mindi/distributions/debian )
• mindi/distributions/mandriva (copied) (copied from branches/stable/mindi/distributions/mandriva )
• mindi/distributions/redhat (copied) (copied from branches/stable/mindi/distributions/redhat )
• mindi/distributions/rpm (copied) (copied from branches/stable/mindi/distributions/rpm )
• mindi/distributions/suse (copied) (copied from branches/stable/mindi/distributions/suse )
• mondo/distributions/common (deleted)
• mondo/distributions/conf (copied) (copied from branches/stable/mondo/distributions/conf )
• mondo/distributions/mandriva (copied) (copied from branches/stable/mondo/distributions/mandriva )
• mondo/distributions/redhat (copied) (copied from branches/stable/mondo/distributions/redhat )
• mondo/distributions/rpm (copied) (copied from branches/stable/mondo/distributions/rpm )
• mondo/distributions/suse (copied) (copied from branches/stable/mondo/distributions/suse )
• tools/mkcommon (modified) (4 diffs)
• tools/mkrpm (modified) (2 diffs)
• tools/mkspec (copied) (copied from branches/stable/tools/mkspec )
• tools/rpm-env (modified) (3 diffs)
• website/favicon.ico (modified) ( previous)
• website/images/bird_world.png (modified) ( previous)
• website/images/screenshots.png (copied) (copied from branches/stable/website/images/screenshots.png )
• website/mondorescue.org.conf (modified) (2 diffs)

trunk/documentation/mondorescue-howto.sgml

@@ -4 +4 @@
 
 <!ENTITY WWWB "http://www.mondorescue.org/">
-<!ENTITY WWW '<ulink url=&WWWB;>MondoRescue</ulink>'>
+<!ENTITY WWW '<ulink url="http://www.mondorescue.org">MondoRescue</ulink>'>
 <!ENTITY ML '<ulink url="http://lists.sourceforge.net/lists/listinfo/mondo-devel">mondorescue mailing list</ulink>'>
 <!ENTITY gfdl SYSTEM "fdl.sgml">
@@ -1371 +1371 @@
         to work, please refer to the file README.pxe provided with 
         your mindi package.
+</para>
 </sect2>
 </sect1>
@@ -2267 +2268 @@
 see what you're kernel must support.</para>
 </answer>
+</qandaentry>
+<qandaentry>
 <question>
 <para><anchor id="COPYBOOTDATADISK"/>Q: How do i copy boot+data

trunk/tools/mkcommon

@@ -22 +22 @@
     rm -fr mindi-kernel-${MINDI_VER}
     svn export ${VER}/mindi-kernel mindi-kernel-${MINDI_VER}
-    #cp -a ${VER}/mindi-kernel mindi-kernel-${MINDI_VER}
-    #find mindi-kernel-${MINDI_VER} -type d -name .svn | xargs rm -rf
-    #find mindi-kernel-${MINDI_VER} -type f -name '.*.swp' | xargs rm -rf
-    #find mindi-kernel-${MINDI_VER} -type f -name '*~' | xargs rm -rf
     mkdir -p ${TOPDIR}/SOURCES 
 
@@ -37 +33 @@
     rm -fr mindi-${MINDI_VER}
     svn export ${VER}/mindi mindi-${MINDI_VER}
-    #cp -a ${VER}/mindi mindi-${MINDI_VER}
     cp -a /tmp/mondorescue-svn.log mindi-${MINDI_VER}/svn.log
     echo "$REVISION" > mindi-${MINDI_VER}/REVISION
-    #find mindi-${MINDI_VER} -type d -name .svn | xargs rm -rf
-    #find mindi-${MINDI_VER} -type f -name '.*.swp' | xargs rm -rf
-    #find mindi-${MINDI_VER} -type f -name '*~' | xargs rm -rf
     rm -f mindi-${MINDI_VER}/rootfs/sbin/parted2fdisk-ia64 
-    #rm -f mindi-${MINDI_VER}/parted2fdisk mindi-${MINDI_VER}/parted2fdisk.c mindi-${MINDI_VER}/rootfs/sbin/parted2fdisk-ia64 
 
     echo "Creating mindi tar files"
@@ -56 +47 @@
     rm -rf mondo-${MONDO_VER}
     svn export ${VER}/mondo mondo-${MONDO_VER}
-    #cp -a ${VER}/mondo mondo-${MONDO_VER}
     cp -a /tmp/mondorescue-svn.log mondo-${MONDO_VER}/svn.log
     echo "$REVISION" > mondo-${MONDO_VER}/REVISION
@@ -63 +53 @@
     cd documentation-${MONDO_VER}
     make install INSTALLDIR=../mondo-${MONDO_VER}/mondo/docs/en
+    if [ $? != 0 ]; then
+        exit -1
+    fi
     cd ../mondo-${MONDO_VER}
     echo "Bootstraping mondo ... "
     ./bootstrap
-    #find . -type d -name .svn | xargs rm -rf
-    #find . -type f -name '.*.swp' | xargs rm -rf
-    #find . -type f -name '*~' | xargs rm -rf
     cd ..
 

trunk/tools/mkrpm

@@ -28 +28 @@
     cd ${BASE}/svn
     mkdir -p ${TOPDIR}/SOURCES 
-    sed "s/^%define mrel..*RRR/%define mrel ${REVISION}${suf}/" mindi-kernel-${MINDI_VER}/mindi-kernel.spec > ${TOPDIR}/SPECS/mindi-kernel.spec
+    $TOOLHOME/mkspec ${MINDI_VER} mindi-kernel-${MINDI_VER}/mindi-kernel.spec > ${TOPDIR}/SPECS/mindi-kernel.spec
     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-kernel-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
 fi
 if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
     cd ${BASE}/svn
-    if [ -f mindi-${MINDI_VER}/distributions/${ddir}/mindi.spec ]; then
-        specfile=mindi-${MINDI_VER}/distributions/${ddir}/mindi.spec
-    else
-        specfile=mindi-${MINDI_VER}/distributions/common/mindi.spec
-    fi
-    sed -e "s/^%define mrel..*RRR/%define mrel  ${REVISION}${suf}/" -e "s/VVV/${MINDI_VER}/" $specfile > ${TOPDIR}/SPECS/mindi.spec
+    $TOOLHOME/mkspec ${MINDI_VER} mindi-${MINDI_VER}/distributions/rpm/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
     rm -rf mindi-${MINDI_VER}/distributions
     mkdir -p ${TOPDIR}/SOURCES 
@@ -48 +43 @@
 if [ "`echo $c | grep  mondo`" != "" ]; then
     cd ${BASE}/svn
-    if [ -f mondo-${MONDO_VER}/distributions/${ddir}/mondo.spec ]; then
-        specfile=mondo-${MONDO_VER}/distributions/${ddir}/mondo.spec
-    else
-        specfile=mondo-${MONDO_VER}/distributions/common/mondo.spec
-    fi
-    sed -e "s/^%define mrel..*RRR/%define mrel  ${REVISION}${suf}/" -e "s/VVV/${MONDO_VER}/" $specfile > ${TOPDIR}/SPECS/mondo.spec
+    $TOOLHOME/mkspec ${MONDO_VER} mondo-${MONDO_VER}/distributions/rpm/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
     rm -rf mondo-${MONDO_VER}/distributions
 

trunk/tools/rpm-env

@@ -33 +33 @@
 
 if [ -e /etc/mandriva-release ]; then
+    export dfam="mandriva"
     export ddir="mandriva"
     export dver=`awk '{print $4}' /etc/mandriva-release`
     export suf=".`echo $dver | sed 's/\.//'`mdk"
 elif [ -e /etc/mandrake-release ]; then
+    export dfam="mandriva"
     export ddir="mandrake"
     export dver=`awk '{print $3}' /etc/mandrake-release`
@@ -43 +45 @@
     grep -q Enterprise /etc/redhat-release
     if [ $? -eq 0 ]; then
+        export dfam="redhat"
         export ddir="rhel"
         export dver=`awk '{print $7}' /etc/redhat-release`
     elif grep -q Fedora /etc/redhat-release ; then
+        export dfam="redhat"
         export ddir="fedora"
         export dver=`awk '{print $4}' /etc/redhat-release`
         export suf=".fc${dver}"
     else
+        export dfam="redhat"
         export ddir="redhat"
         dver=`awk '{print $5}' /etc/redhat-release`
@@ -58 +63 @@
     grep -q Enterprise /etc/SuSE-release
     if [ $? -eq 0 ]; then
+        export dfam="suse"
         export ddir="sles"
         export dver=`head -1 /etc/SuSE-release | awk '{print $5}'`
     else
+        export dfam="suse"
         export ddir="suse"
         export dver=`head -1 /etc/SuSE-release | awk '{print $3}'`
     fi
 else
+    export dfam="generic"
     export dver=""
     export ddir="generic"

trunk/website/mondorescue.org.conf

@@ -5 +5 @@
 
 <VirtualHost *:80>
-    ServerName www.mondorecue.org
+    ServerName www.mondorescue.org
     ServerAdmin webmaster@mondorescue.org
     DocumentRoot /mondo/www/html/mondo
@@ -19 +19 @@
 
 <VirtualHost *:80>
-    ServerName www1.mondorecue.org
+    ServerName www1.mondorescue.org
     ServerAdmin webmaster@mondorescue.org
     DocumentRoot /mondo/www/html/test