- 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 (file)
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 c6047ec57a21e4ac58fd4becfd054d6a07292cdc..082be36a817382b8bd9a8dedbf8f8007e80e342a 100644 (file)
--- 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}