rc-scripts-svn.patch

   1 Index: rc.d/rc.sysinit
   2 ===================================================================
   3 --- rc.d/rc.sysinit     (wersja 11895)
   4 +++ rc.d/rc.sysinit     (kopia robocza)
   5 @@ -272,13 +272,17 @@
   6
   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
  20 +               fi
  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
  25 +               fi
  26         fi
  27
  28         # Configure Linux kernel (initial configuration, some required modules still
  29 @@ -342,10 +346,11 @@
  30                         modprobe dm-mod
  31                 fi
  32
  33 -               # but should do this before swapon?
  34                 . /etc/rc.d/init.d/cryptsetup
  35                 show "Starting disk encryption"
  36 -               init_crypto 0 && ok || fail
  37 +               init_crypto 0
  38 +               delay_cryptsetup=$?
  39 +               [ $delay_cryptsetup = 0 ] && ok || fail
  40         fi
  41
  42         # Start up swapping
  43 @@ -461,10 +466,11 @@
  44                 done
  45         fi
  46
  47 -       if [ -f /etc/crypttab ] && ! is_empty_file /etc/crypttab; then
  48 -               # XXX, this must be probably done after random is initialized from /var/run/random-seed
  49 +       if [ "$delay_cryptsetup" != 0 ]; then
  50                 show "Starting disk encryption using the RNG"
  51 -               init_crypto 1 && ok || fail
  52 +               init_crypto 1
  53 +               delay_cryptsetup=$?
  54 +               [ $delay_cryptsetup = 0 ] && ok || fail
  55         fi
  56  else
  57         # Start logging console output since we have all /dev stuff setup
  58 @@ -669,6 +675,13 @@
  59                 fi
  60         fi
  61
  62 +       if [ "$delay_cryptsetup" != 0 ]; then
  63 +               show "Starting disk encryption"
  64 +               init_crypto 1
  65 +               delay_cryptsetup=$?
  66 +               [ $delay_cryptsetup = 0 ] && ok || fail
  67 +       fi
  68 +
  69         # Add raid devices
  70         if [ -x /sbin/mdadm -a -f /etc/mdadm.conf ] || [ -f /etc/raidtab ]; then
  71                 modprobe -s md >/dev/null 2>&1