- add systemd tmpfiles config

[packages/rc-scripts.git] / rc-scripts-svn.patch

diff --git a/rc-scripts-svn.patch b/rc-scripts-svn.patch
index f0e032f52bd5258bdd54e602a4230581301e3c3a..c8dc4861131ef51f1438ff954e615dba0f13dd6d 100644 (file)
--- a/rc-scripts-svn.patch
+++ b/rc-scripts-svn.patch
@@ -1,79 +1,54 @@
+--- lib/functions      2011-12-14 13:23:27.000000000 +0200
++++ lib/functions      2011-12-14 19:16:08.333233967 +0200
+@@ -643,7 +643,7 @@
+               nice=${nice:-0}
+ 
+               # make nice level absolute, not to be dependant of nice level of shell where service started
+-              nice=$((nice-$(nice)))
++              nice=$(($nice - $(nice)))
+ 
+               if [ "$closefds" = 1 ]; then
+                       exec 1>&-
 Index: rc.d/rc.sysinit
 ===================================================================
---- rc.d/rc.sysinit    (wersja 11895)
+--- rc.d/rc.sysinit    (wersja 12454)
 +++ 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
+@@ -617,23 +617,26 @@
+               fi
+               if [ "$lvmversion" = "1" ] ; then
+                       modprobe -s lvm-mod >/dev/null 2>&1
++                      lvmignorelocking=""
+                       lvmsysinit=""
+               elif [ "$lvmversion" = "2" ] ; then
+                       modprobe -s dm-mod >/dev/null 2>&1
++                      lvmignorelocking="--ignorelockingfailure"
+                       lvmsysinit="--sysinit"
+               else
+                       modprobe -s lvm-mod >/dev/null 2>&1
+                       # device mapper (2.5+ and patched 2.4)
+                       modprobe -s dm-mod >/dev/null 2>&1
++                      lvmignorelocking=""
+                       lvmsysinit=""
                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 @@
+-              run_cmd "Scanning for LVM volume groups" /sbin/vgscan $lvmsysinit
++              run_cmd "Scanning for LVM volume groups" /sbin/vgscan $lvmignorelocking
+               run_cmd "Activating LVM volume groups" /sbin/vgchange -a y $lvmsysinit
+               if [ "$lvmversion" = "2" ]; then
+-                      /sbin/vgmknodes $lvmsysinit
++                      /sbin/vgmknodes $lvmignorelocking
+                       # display VG statistics
+-                      /sbin/vgdisplay -s $lvmsysinit
++                      /sbin/vgdisplay -s $lvmignorelocking
                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
+@@ -732,7 +735,7 @@
+                       # LVM on RAID (keep in sync with LVM setting few lines above)
+                       if [ "$golvm" -eq "1" ]; then
+                               if [ -x /sbin/vgscan -a -x /sbin/vgchange ]; then
+-                                      run_cmd "Scanning for LVM volume groups (on RAID)" /sbin/vgscan $lvmsysinit
++                                      run_cmd "Scanning for LVM volume groups (on RAID)" /sbin/vgscan $lvmignorelocking
+                                       run_cmd "Activating LVM volume groups (on RAID)" /sbin/vgchange -a y $lvmsysinit
+                                       [ "$lvmversion" = "2" ] && /sbin/vgmknodes
+                               fi