Changeset 1273 in MondoRescue

Timestamp:

Mar 26, 2007, 7:37:17 PM (18 years ago)

Author:

Bruno Cornec

Message:

• On CentOS 4.4 mdrun isn't available anymore so init should use mdadm instead.

(based on a patch of Momtchil Momtchev <momtchil.momtchev_at_linagora.com>)

• mkchangelog now supports an fc option for Fedora pkg genration
• Try to improve Fedora official packages generation

Location:

branches/2.2.2

Files:

• mindi/rootfs/sbin/init (modified) (2 diffs)
• tools/mkchangelog.pl (modified) (2 diffs)
• tools/pkg2fc (modified) (2 diffs)
• tools/svn2build (modified) (1 diff)

branches/2.2.2/mindi/rootfs/sbin/init

@@ -309 +309 @@
 StartRaids() {
     local raid_devices i
+
+    raid_devices=`grep /dev/md /tmp/mountlist.txt | cut -d' ' -f1`
     if which raidstart > /dev/null 2> /dev/null ; then
-        raid_devices=`grep /dev/md /tmp/mountlist.txt | cut -d' ' -f1`
         for i in $raid_devices ; do
             if grep `basename $i` /proc/mdstat > /dev/null 2> /dev/null ; then
@@ -322 +323 @@
         LogIt "Running 'mdrun'" 1
         mdrun
+    elif which mdadm > /dev/null 2> /dev/null ; then
+        LogIt "Running 'mdadm'" 1
+        for i in $raid_devices ; do
+            if grep `basename $i` /proc/mdstat > /dev/null 2> /dev/null ; then
+                LogIt "$i is started already; no need to run 'mdadm $i'" 1
+            else
+                LogIt "Running 'mdadm $i'" 1
+                mdadm -Ac partitions -m dev $i
+            fi
+        done
     else
         LogIt "Warning: Neither 'raidstart' nor 'mdrun''found. RAID devices may not have started." 1

branches/2.2.2/tools/mkchangelog.pl

@@ -96 +96 @@
     $n2date = &UnixDate($date,"%a, %d %b %Y %H:%M:%S %z");
     #print "**$ndate**\n";
-    if ($dtype eq "rpm") {
+    if (($dtype eq "rpm") || ($dtype eq "fc")) {
         if ($ver !~ /-/) {
             if ($first eq 1) {
@@ -120 +120 @@
             print OUTPUT "  * $tmp";
         }
-        else {
+        else if ($dtype eq "rpm") {
             print OUTPUT "$tmp";
         }

branches/2.2.2/tools/pkg2fc

@@ -61 +61 @@
 for p in $ppkg ; do
     rpm -ivh \$p
+    src=\`rpm -qlp \$p | grep -E '\.spec'\`
+    spec=\`tar tvf rpm/SOURCES/\$src | grep -E "\$p-fc.spec"\`
+    tar xf rpm/SOURCES/\$src \$spec
     s=\`rpm -qlp \$p | egrep '\.spec'\`
+    mv \$p-fc.spec rpm/SPECS/\$s
     # Use dist for fc
-    perl -pi -e "s/define Release:[ \t]+([0-9]+)..*/define Release: $1%{?dist}/" rpm/SPECS/\$s
+    perl -pi -e "s/define Release:[ \t]+([0-9]+)..*/define Release: \$1%{?dist}/" rpm/SPECS/\$s
     perl -pi -e 's/ Bruno Cornec <bruno@mondorescue.org>..*/ Bruno Cornec <bruno@mondorescue.org> %{version}-%{release}/' rpm/SPECS/\$s
     rm -rf rpm/BUILD/*
@@ -79 +83 @@
 echo "Packages rebuild on ${DSTNODE}"
 ssh -q ${ACCOUNT} ${DSTNODE} "./mkmondo"
-) 2>&1 | tee /tmp/pk2mdv.log
+) 2>&1 | tee /tmp/pk2fc.log

branches/2.2.2/tools/svn2build

@@ -81 +81 @@
             fi
 
+            if [ $ddir = "fedora" ]; then
+                $TOOLHOME/mkchangelog.pl fc $p $MONDOTMP/$p-fc.spec
+                m4 $MONDOTMP/mondorescue.mc $inc $dest/distributions/rpm/$p.spec $MONDOTMP/$p-fc.spec > $dest/distributions/${ddir}-$dver/$p-fc.spec
+            fi
             $TOOLHOME/mkchangelog.pl $dtype $p $MONDOTMP/$p.spec
             if [ $? -ne 0 ]; then