- rel 2; cgroup fixes and crypto change from svn

Changed files:
    rc-scripts-svn.patch -> 1.3
    rc-scripts.spec -> 1.336

diff --git a/rc-scripts-svn.patch b/rc-scripts-svn.patch
new file mode 100644 (file)
index 0000000..d3e12f9
--- /dev/null
+++ b/rc-scripts-svn.patch
@@ -0,0 +1,71 @@
+Index: rc.d/rc.sysinit
+===================================================================
+--- rc.d/rc.sysinit    (wersja 11895)
++++ rc.d/rc.sysinit    (kopia robocza)
+@@ -272,13 +272,17 @@
+ 
+       # cgroup/cpuset support
+       if grep -q cgroup /proc/filesystems 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
+-              modprobe -s blk-cgroup 2> /dev/null
+-              mount -n -t cgroup none /dev/cgroup
++              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
++                      modprobe -s blk-cgroup 2> /dev/null
++                      mount -n -t cgroup none /dev/cgroup
++              fi
+       elif grep -q cpuset /proc/filesystems 2>/dev/null ; then
+-              mount -n -t cpuset none /dev/cpuset
++              if ! grep -q cpuset /etc/fstab 2>/dev/null ; then
++                      mount -n -t cpuset none /dev/cpuset
++              fi
+       fi
+ 
+       # Configure Linux kernel (initial configuration, some required modules still
+@@ -342,10 +346,11 @@
+                       modprobe dm-mod
+               fi
+ 
+-              # but should do this before swapon?
+               . /etc/rc.d/init.d/cryptsetup
+               show "Starting disk encryption"
+-              init_crypto 0 && ok || fail
++              init_crypto 0
++              delay_cryptsetup=$?
++              [ $delay_cryptsetup = 0 ] && ok || fail
+       fi
+ 
+       # Start up swapping
+@@ -461,10 +466,11 @@
+               done
+       fi
+ 
+-      if [ -f /etc/crypttab ] && ! is_empty_file /etc/crypttab; then
+-              # XXX, this must be probably done after random is initialized from /var/run/random-seed
++      if [ "$delay_cryptsetup" != 0 ]; then
+               show "Starting disk encryption using the RNG"
+-              init_crypto 1 && ok || fail
++              init_crypto 1
++              delay_cryptsetup=$?
++              [ $delay_cryptsetup = 0 ] && ok || fail
+       fi
+ else
+       # Start logging console output since we have all /dev stuff setup
+@@ -669,6 +675,13 @@
+               fi
+       fi
+ 
++      if [ "$delay_cryptsetup" != 0 ]; then
++              show "Starting disk encryption"
++              init_crypto 1
++              delay_cryptsetup=$?
++              [ $delay_cryptsetup = 0 ] && ok || fail
++      fi
++
+       # Add raid devices
+       if [ -x /sbin/mdadm -a -f /etc/mdadm.conf ] || [ -f /etc/raidtab ]; then
+               modprobe -s md >/dev/null 2>&1

diff --git a/rc-scripts.spec b/rc-scripts.spec
index 96eb04c01babc0b9f05f004077aa87f41cfb0856..bae529435270ba7c839300656654127dcfeeaa6f 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.5
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Base
 Source0:       ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
 # Source0-md5: 599cf1c5a381265b513d33258fd2069d
+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}