+++ /dev/null
-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
-@@ -335,6 +339,7 @@
- TIME_SETUP_DELAYED=yes
- fi
-
-+ delay_cryptsetup=0
- if [ -f /etc/crypttab ] && ! is_empty_file /etc/crypttab; then
- # XXX might need modules dep
- # Device mapper & related initialization
-@@ -342,10 +347,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 +467,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 +676,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
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: 3
+Version: 0.4.3.6
+Release: 1
License: GPL v2
Group: Base
Source0: ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
-# Source0-md5: 599cf1c5a381265b513d33258fd2069d
-Patch0: %{name}-svn.patch
+# Source0-md5: ef74f5a0b99b12f8a4c630f2b02f04bb
URL: http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/
BuildRequires: autoconf
BuildRequires: automake
%prep
%setup -q
-%patch0 -p0
%build
%{__aclocal}
for i in 2 3 4 5; do
ln -s ../init.d/local $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S99local
+ ln -s ../init.d/netfs $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S25netfs
ln -s ../init.d/network $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S10network
ln -s ../init.d/allowlogin $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S99allowlogin
ln -s ../init.d/sys-chroots $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S99sys-chroots
done
for i in 0 1 6; do
+ ln -s ../init.d/netfs $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K75netfs
ln -s ../init.d/network $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K90network
ln -s ../init.d/allowlogin $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K01allowlogin
ln -s ../init.d/sys-chroots $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K01sys-chroots
%attr(754,root,root) /etc/rc.d/init.d/cryptsetup
%attr(754,root,root) /etc/rc.d/init.d/killall
%attr(754,root,root) /etc/rc.d/init.d/local
+%attr(754,root,root) /etc/rc.d/init.d/netfs
%attr(754,root,root) /etc/rc.d/init.d/network
%attr(754,root,root) /etc/rc.d/init.d/random
%attr(754,root,root) /etc/rc.d/init.d/single
%attr(754,root,root) /etc/rc.d/rc?.d/K??cpusets
%attr(754,root,root) /etc/rc.d/rc?.d/K??killall
%attr(754,root,root) /etc/rc.d/rc?.d/K??local
+%attr(754,root,root) /etc/rc.d/rc?.d/K??netfs
%attr(754,root,root) /etc/rc.d/rc?.d/K??network
%attr(754,root,root) /etc/rc.d/rc?.d/K??random
%attr(754,root,root) /etc/rc.d/rc?.d/K??single
%attr(754,root,root) /etc/rc.d/rc?.d/S??cpusets
%attr(754,root,root) /etc/rc.d/rc?.d/S??killall
%attr(754,root,root) /etc/rc.d/rc?.d/S??local
+%attr(754,root,root) /etc/rc.d/rc?.d/S??netfs
%attr(754,root,root) /etc/rc.d/rc?.d/S??network
%attr(754,root,root) /etc/rc.d/rc?.d/S??random
%attr(754,root,root) /etc/rc.d/rc?.d/S??single