Author: arekm Date: Thu Sep 3 10:12:42 2009 GMT Module: packages Tag: HEAD ---- Log message: - rel 2; fix mdadm handling for mdadm 3
---- Files affected: packages/rc-scripts: rc-scripts.spec (1.307 -> 1.308) , rc-scripts-mdadm.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/rc-scripts/rc-scripts.spec diff -u packages/rc-scripts/rc-scripts.spec:1.307 packages/rc-scripts/rc-scripts.spec:1.308 --- packages/rc-scripts/rc-scripts.spec:1.307 Sun Aug 16 22:59:06 2009 +++ packages/rc-scripts/rc-scripts.spec Thu Sep 3 12:12:36 2009 @@ -10,12 +10,13 @@ Summary(tr.UTF-8): inittab ve /etc/rc.d dosyaları Name: rc-scripts Version: 0.4.2.4 -Release: 1 +Release: 2 License: GPL v2 Group: Base Source0: ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz # Source0-md5: 95b3591898500557e73e5aaaac6b0595 Patch0: dropcaps.patch +Patch1: %{name}-mdadm.patch URL: http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/ BuildRequires: autoconf BuildRequires: automake @@ -105,6 +106,7 @@ %prep %setup -q %patch0 -p0 +%patch1 -p0 %build %{__aclocal} @@ -344,6 +346,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.308 2009/09/03 10:12:36 arekm +- rel 2; fix mdadm handling for mdadm 3 + Revision 1.307 2009/08/16 20:59:06 arekm - up to 0.4.2.4 (fixed modprobe problems) ================================================================ Index: packages/rc-scripts/rc-scripts-mdadm.patch diff -u /dev/null packages/rc-scripts/rc-scripts-mdadm.patch:1.1 --- /dev/null Thu Sep 3 12:12:42 2009 +++ packages/rc-scripts/rc-scripts-mdadm.patch Thu Sep 3 12:12:36 2009 @@ -0,0 +1,26 @@ +Index: rc.d/rc.sysinit +=================================================================== +--- rc.d/rc.sysinit (wersja 10517) ++++ rc.d/rc.sysinit (kopia robocza) +@@ -668,9 +672,19 @@ + rc=0 + if [ -x /sbin/mdadm -a -f /etc/mdadm.conf ]; then + if (grep -qE "^([[:blank:]]|)ARRAY[[:blank:]]" /etc/mdadm.conf 2>/dev/null); then +- run_cmd "Starting up RAID devices" /sbin/mdadm --assemble --scan --auto=yes ++ show "Starting up RAID devices"; busy ++ /sbin/mdadm --assemble --scan --auto=yes + rc=$? +- [ "$rc" -eq 0 ] && goraidtab=0 && golvm=1 ++ if [ "$rc" -eq 0 -o "$rc" -eq 2 ]; then ++ # rc is used later, too so set sane value ++ rc=0 ++ deltext; ok ++ goraidtab=0 ++ golvm=1 ++ else ++ deltext; fail ++ fi ++ + fi + fi + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rc-scripts/rc-scripts.spec?r1=1.307&r2=1.308&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
