From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Wed, 22 Dec 2010 05:59:32 +0000 (+0000)
Subject: - rel 2; cgroup/cpuset can be commented out in fstab
X-Git-Tag: auto/th/rc-scripts-0_4_3_7-2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frc-scripts.git;a=commitdiff_plain;h=2cb232776db1179dcc054cc324c71541395f9f8c

- rel 2; cgroup/cpuset can be commented out in fstab

Changed files:
    rc-scripts-svn.patch -> 1.6
    rc-scripts.spec -> 1.340
---

diff --git a/rc-scripts-svn.patch b/rc-scripts-svn.patch
new file mode 100644
index 0000000..3e9fe5e
--- /dev/null
+++ b/rc-scripts-svn.patch
@@ -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
diff --git a/rc-scripts.spec b/rc-scripts.spec
index c6047ec..082be36 100644
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -9,11 +9,12 @@ Summary(pl.UTF-8):	inittab i skrypty startowe z katalogu /etc/rc.d
 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
@@ -108,6 +109,7 @@ programcıklar içerir.
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %{__aclocal}