- 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 74ea6e07e7863dae73857902f474929847c7143c..c8dc4861131ef51f1438ff954e615dba0f13dd6d 100644 (file)
--- a/rc-scripts-svn.patch
+++ b/rc-scripts-svn.patch
@@ -1,56 +1,54 @@
-Index: rc.d/rc.sysinit
-===================================================================
---- rc.d/rc.sysinit    (.../tags/0.4.0.16)     (wersja 4664)
-+++ rc.d/rc.sysinit    (.../trunk)     (wersja 4664)
-@@ -106,6 +106,12 @@
-       /bin/dmesg -n $CONSOLE_LOGLEVEL
- fi
- 
-+if [ -f /etc/udev/udev.conf ];then
-+      . /etc/udev/udev.conf
-+fi
-+
-+[ -x /sbin/start_udev ] && run_cmd "Starting udev" /sbin/start_udev
-+      
- # /dev must be also mounted before everything but only if we want use them ;-)
- if is_yes "$MOUNT_DEVFS"; then
-       run_cmd "Mounting Device Filesystem" mount -n -t devfs /dev /dev
-@@ -741,10 +747,6 @@
- rm -rf /tmp/.X*-unix /tmp/.ICE-unix /tmp/.font-unix /tmp/hsperfdata_* \
-       /tmp/kde-* /tmp/ksocket-* /tmp/mc-* /tmp/mcop-* /tmp/orbit-*  \
-       /tmp/scrollkeeper-*  /tmp/ssh-*
--# Make ICE directory
--mkdir -m 1777 -p /tmp/.ICE-unix > /dev/null 2>&1
--chown root:root /tmp/.ICE-unix
--restorecon /tmp/.ICE-unix > /dev/null 2>&1
+--- 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}
  
- {
- # Clean up utmp/wtmp
-@@ -765,6 +767,12 @@
-       rm -rf /tmp/* /tmp/.[a-zA-Z0-9]*
- fi
+               # make nice level absolute, not to be dependant of nice level of shell where service started
+-              nice=$((nice-$(nice)))
++              nice=$(($nice - $(nice)))
  
-+# System protected dirs
-+mkdir -m 1777 -p /tmp/.ICE-unix > /dev/null 2>&1
-+chown root:root /tmp/.ICE-unix
-+restorecon /tmp/.ICE-unix > /dev/null 2>&1
-+
-+
- # Right, now turn on swap in case we swap to files
- swapon -a >/dev/null 2>&1
- run_cmd "Enabling swap space" /bin/true
-Index: sysconfig/interfaces/ifcfg-description
+               if [ "$closefds" = 1 ]; then
+                       exec 1>&-
+Index: rc.d/rc.sysinit
 ===================================================================
---- sysconfig/interfaces/ifcfg-description     (.../tags/0.4.0.16)     (wersja 4664)
-+++ sysconfig/interfaces/ifcfg-description     (.../trunk)     (wersja 4664)
-@@ -6,8 +6,8 @@
-   from lowest value first. You need to set BOOTPRIO in _all_ your
-   ifcfg* files because if you won't do that only these interfaces
-   with BOOTPRIO variable will be configured. Use the same schema
--  when setting variable for example BOOTPRIO=numer
--  or BOOTPRIO="numer" because sorting is done by sort command.
-+  when setting variable for example BOOTPRIO=number
-+  or BOOTPRIO="number" because sorting is done by sort command.
+--- rc.d/rc.sysinit    (wersja 12454)
++++ rc.d/rc.sysinit    (kopia robocza)
+@@ -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
+ 
+-              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
  
- [ BOOTPROTO={none|bootp|dhcp|pump} ]
-   You can specify which dhcp client to use with the DHCP_CLIENT, if
+@@ -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