Changeset 519 in MondoRescue for branches/2.0.8/tools

Timestamp:

May 1, 2006, 1:54:31 AM (19 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/tools

Files:

• livwww (modified) (2 diffs)
• mkdeb (modified) (1 diff)
• mkqemu (copied) (copied from branches/stable/tools/mkqemu ) (5 diffs)
• qemu-vm.txt (copied) (copied from branches/stable/tools/qemu-vm.txt ) (1 diff)

branches/2.0.8/tools/livwww

@@ -16 +16 @@
 TESTDIR=/mondo/www/html/test
 
-force=0
+force=1
 nodoc=0
 
-if [ "$1" = "-f" ]; then
-        force=1
+if [ "$1" = "--keep" ]; then
+        force=0
         optsvn=""
         shift
@@ -35 +35 @@
     DESTMACH=mondo.hpintelco.org
 else
-    DESTMACH=www1.mondorescue.org
+    DESTMACH=www.mondorescue.org
 fi
 

branches/2.0.8/tools/mkdeb

@@ -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
-    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-kernel-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
+    $TOOLHOME/mkspec ${MINDI_VER} mindi-kernel-${MINDI_VER}/mindi-kernel.spec > ${TOPDIR}/SPECS/mindi-kernel.spec
+    chmod 644 ${TOPDIR}/SPECS/mindi-kernel.spec
+    pkg1="${TOPDIR}/RPMS/${ARCH}/mindi-kernel-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
+    pkg="$pkg $pkg1"
+    rm -f $pkg1
 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
+    cat mindi-${MINDI_VER}/distributions/$dfam/changelog >> ${TOPDIR}/SPECS/mindi.spec
+    chmod 644 ${TOPDIR}/SPECS/mindi.spec
     rm -rf mindi-${MINDI_VER}/distributions
     mkdir -p ${TOPDIR}/SOURCES 
 
-    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
-    # ATTENTION: This could be dangerous for your setup
-    opt="rm -rf /usr/lib/mindi ;"
+    pkg1="${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
+    pkg="$pkg $pkg1"
+    rm -f $pkg1
 fi
 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
+    cat mondo-${MONDO_VER}/distributions/$dfam/changelog >> ${TOPDIR}/SPECS/mondo.spec
+    chmod 644 ${TOPDIR}/SPECS/mondo.spec
     rm -rf mondo-${MONDO_VER}/distributions
 
-    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${REVISION}${suf}.${ARCH}.rpm"
+    pkg1="${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${REVISION}${suf}.${ARCH}.rpm"
+    pkg="$pkg $pkg1"
+    rm -f $pkg1
 fi
 

branches/2.0.8/tools/mkqemu

@@ -12 +12 @@
 
 if [ _"$2" == _"" ]; then
-    export SVN_VM="mdk101 mdk102 mdv2006 rhel3 rhel4 rh73 fc4 sles9"
+    export SVN_VM="mdk101 mdk102 mdv2006 rh73 rh9 fc4 fc5 rhel3 rhel4 suse10 sles9 debian31"
 else
     export SVN_VM="$2"
@@ -43 +43 @@
     fi
 fi
-\$SVN_HOME/$1/tools/mkrpm < /dev/null
+echo \$SVN_VM | grep -q "debian"
+if [ \$? -eq 0 ]; then
+    \$SVN_HOME/$1/tools/mkdeb < /dev/null
+else
+    \$SVN_HOME/$1/tools/mkrpm < /dev/null
+fi
 \$SVN_HOME/$1/tools/mkdeliv
 EOF
@@ -49 +54 @@
 ipvm=10.0.2.15
 sp=2222
+
 
 for m in $SVN_VM; do
@@ -60 +66 @@
         # Virtual machine alreday started
         vmp=1
-        qemu -m 256 -redir tcp:${sp}:${ipvm}:22 /users/vmplayer/$m.qemu &
-        sleep 240
+        qemu -m 256 $QEMUOPT -redir tcp:${sp}:${ipvm}:22 /users/vmplayer/$m.qemu &
+        sleep 300
     fi
     scp -P $sp /tmp/mkmondo bruno@localhost:
@@ -67 +73 @@
     if [ $vmp -eq 1 ]; then
         ssh -p $sp root@localhost "halt -p"
+        sleep 300
+        proces=`ps auxww | grep qemu | grep -v grep | grep -q /users/vmplayer/$m.qemu | awk '{print $2}'`
+        if [ "$proces" != "" ]; then
+            kill $proces
+        fi
     fi
 done

branches/2.0.8/tools/qemu-vm.txt

@@ -34 +34 @@
 
 Créer compte bruno avec répertoires nécéssaires + env necessaire
-adduser bruno
+useradd bruno
 passwd bruno