2 ===================================================================
3 --- rc.d/rc.sysinit (wersja 11895)
4 +++ rc.d/rc.sysinit (kopia robocza)
7 # cgroup/cpuset support
8 if grep -q cgroup /proc/filesystems 2>/dev/null ; then
9 - # creating is more convenient than artificial conflict with older udev
10 - mkdir -p /dev/cgroup
11 - # mount w/o options enables all available cgroup subsystems
12 - modprobe -s blk-cgroup 2> /dev/null
13 - mount -n -t cgroup none /dev/cgroup
14 + if ! grep -q cgroup /etc/fstab 2>/dev/null ; then
15 + # creating is more convenient than artificial conflict with older udev
16 + mkdir -p /dev/cgroup
17 + # mount w/o options enables all available cgroup subsystems
18 + modprobe -s blk-cgroup 2> /dev/null
19 + mount -n -t cgroup none /dev/cgroup
21 elif grep -q cpuset /proc/filesystems 2>/dev/null ; then
22 - mount -n -t cpuset none /dev/cpuset
23 + if ! grep -q cpuset /etc/fstab 2>/dev/null ; then
24 + mount -n -t cpuset none /dev/cpuset
28 # Configure Linux kernel (initial configuration, some required modules still
30 TIME_SETUP_DELAYED=yes
34 if [ -f /etc/crypttab ] && ! is_empty_file /etc/crypttab; then
35 # XXX might need modules dep
36 # Device mapper & related initialization
41 - # but should do this before swapon?
42 . /etc/rc.d/init.d/cryptsetup
43 show "Starting disk encryption"
44 - init_crypto 0 && ok || fail
47 + [ $delay_cryptsetup = 0 ] && ok || fail
55 - if [ -f /etc/crypttab ] && ! is_empty_file /etc/crypttab; then
56 - # XXX, this must be probably done after random is initialized from /var/run/random-seed
57 + if [ "$delay_cryptsetup" != 0 ]; then
58 show "Starting disk encryption using the RNG"
59 - init_crypto 1 && ok || fail
62 + [ $delay_cryptsetup = 0 ] && ok || fail
65 # Start logging console output since we have all /dev stuff setup
70 + if [ "$delay_cryptsetup" != 0 ]; then
71 + show "Starting disk encryption"
74 + [ $delay_cryptsetup = 0 ] && ok || fail
78 if [ -x /sbin/mdadm -a -f /etc/mdadm.conf ] || [ -f /etc/raidtab ]; then
79 modprobe -s md >/dev/null 2>&1