- 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 8f4d487909b6cf9a752314f63050f4070352941a..c8dc4861131ef51f1438ff954e615dba0f13dd6d 100644 (file)
--- a/rc-scripts-svn.patch
+++ b/rc-scripts-svn.patch
@@ -1,37 +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 12419)
+--- rc.d/rc.sysinit    (wersja 12454)
 +++ rc.d/rc.sysinit    (kopia robocza)
-@@ -465,25 +465,25 @@
-       [ -f /etc/cryptomtab ] && :>/etc/cryptomtab
- 
-       # Enter root, /proc, /sys and other into mtab.
--      mount -f /
--      mount -f /proc
-+      mount -f / 2> /dev/null
-+      mount -f /proc 2> /dev/null
-       if is_fsmounted tmpfs /run; then
--              mount -f -t tmpfs run /run
-+              mount -f -t tmpfs run /run 2> /dev/null
-       fi
- 
-       if is_fsmounted usbfs /proc/bus/usb; then
--              mount -f -t usbfs -o devgid=78,devmode=664 usbfs /proc/bus/usb
-+              mount -f -t usbfs -o devgid=78,devmode=664 usbfs /proc/bus/usb 2> /dev/null
-       fi
- 
-       if is_fsmounted sysfs /sys; then
--              mount -f -t sysfs sysfs /sys
-+              mount -f -t sysfs sysfs /sys 2> /dev/null
-               if is_fsmounted securityfs /sys/kernel/security ; then
--                      mount -f -t securityfs securityfs /sys/kernel/security
-+                      mount -f -t securityfs securityfs /sys/kernel/security 2> /dev/null
+@@ -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
-       fi
  
-       if is_fsmounted selinuxfs /selinux; then
--              mount -f -t selinuxfs selinuxfs /selinux
-+              mount -f -t selinuxfs selinuxfs /selinux 2> /dev/null
+-              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
  
-       emit --no-wait root-filesystem
+@@ -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