Author: arekm Date: Wed Dec 22 05:59:37 2010 GMT Module: packages Tag: HEAD ---- Log message: - rel 2; cgroup/cpuset can be commented out in fstab
---- Files affected: packages/rc-scripts: rc-scripts.spec (1.339 -> 1.340) , rc-scripts-svn.patch (1.5 -> 1.6) ---- Diffs: ================================================================ Index: packages/rc-scripts/rc-scripts.spec diff -u packages/rc-scripts/rc-scripts.spec:1.339 packages/rc-scripts/rc-scripts.spec:1.340 --- packages/rc-scripts/rc-scripts.spec:1.339 Sun Dec 12 18:54:38 2010 +++ packages/rc-scripts/rc-scripts.spec Wed Dec 22 06:59:32 2010 @@ -10,11 +10,12 @@ Summary(tr.UTF-8): inittab ve /etc/rc.d dosyaları Name: rc-scripts Version: 0.4.3.7 -Release: 1 +Release: 2 License: GPL v2 Group: Base Source0: ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz # Source0-md5: 6f349b3c5e74e538e14eaab389625643 +Patch0: %{name}-svn.patch URL: http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/ BuildRequires: autoconf BuildRequires: automake @@ -109,6 +110,7 @@ %prep %setup -q +%patch0 -p0 %build %{__aclocal} @@ -366,6 +368,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.340 2010/12/22 05:59:32 arekm +- rel 2; cgroup/cpuset can be commented out in fstab + Revision 1.339 2010/12/12 17:54:38 glen - up to 0.4.3.7 ================================================================ Index: packages/rc-scripts/rc-scripts-svn.patch diff -u /dev/null packages/rc-scripts/rc-scripts-svn.patch:1.6 --- /dev/null Wed Dec 22 06:59:37 2010 +++ packages/rc-scripts/rc-scripts-svn.patch Wed Dec 22 06:59:32 2010 @@ -0,0 +1,22 @@ +Index: rc.d/rc.sysinit +=================================================================== +--- rc.d/rc.sysinit (wersja 12018) ++++ rc.d/rc.sysinit (kopia robocza) +@@ -272,7 +272,7 @@ + + # cgroup/cpuset support + if grep -q cgroup /proc/filesystems 2>/dev/null ; then +- if ! grep -q cgroup /etc/fstab 2>/dev/null ; then ++ if ! grep -q "^[^#].*cgroup" /etc/fstab 2>/dev/null ; then + # creating is more convenient than artificial conflict with older udev + mkdir -p /dev/cgroup + # mount w/o options enables all available cgroup subsystems +@@ -280,7 +280,7 @@ + mount -n -t cgroup none /dev/cgroup + fi + elif grep -q cpuset /proc/filesystems 2>/dev/null ; then +- if ! grep -q cpuset /etc/fstab 2>/dev/null ; then ++ if ! grep -q "^[^#].*cpuset" /etc/fstab 2>/dev/null ; then + mount -n -t cpuset none /dev/cpuset + fi + fi ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rc-scripts/rc-scripts.spec?r1=1.339&r2=1.340&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rc-scripts/rc-scripts-svn.patch?r1=1.5&r2=1.6&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
