- fix nice calc for ksh

Changed files:
    rc-scripts-svn.patch -> 1.16
    rc-scripts.spec -> 1.380

diff --git a/rc-scripts-svn.patch b/rc-scripts-svn.patch
index 8f4d487909b6cf9a752314f63050f4070352941a..a099f0b1db276f49eaa1cb332b0926d0c15ea255 100644 (file)
--- a/rc-scripts-svn.patch
+++ b/rc-scripts-svn.patch
@@ -1,37 +1,11 @@
-Index: rc.d/rc.sysinit
-===================================================================
---- rc.d/rc.sysinit    (wersja 12419)
-+++ rc.d/rc.sysinit    (kopia robocza)
-@@ -465,25 +465,25 @@
-       [ -f /etc/cryptomtab ] && :>/etc/cryptomtab
+--- 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}
  
-       # 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
+               # make nice level absolute, not to be dependant of nice level of shell where service started
+-              nice=$((nice-$(nice)))
++              nice=$(($nice - $(nice)))
  
-       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
-               fi
-       fi
- 
-       if is_fsmounted selinuxfs /selinux; then
--              mount -f -t selinuxfs selinuxfs /selinux
-+              mount -f -t selinuxfs selinuxfs /selinux 2> /dev/null
-       fi
- 
-       emit --no-wait root-filesystem
+               if [ "$closefds" = 1 ]; then
+                       exec 1>&-

diff --git a/rc-scripts.spec b/rc-scripts.spec
index f49b99628d2ec91717aa35b1e1589a9e220429c5..704b686dd22f73ddb342b7d309a69da062f8e303 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -9,7 +9,7 @@ Summary(pl.UTF-8):      inittab i skrypty startowe z katalogu /etc/rc.d
 Summary(tr.UTF-8):     inittab ve /etc/rc.d dosyaları
 Name:          rc-scripts
 Version:       0.4.5.2
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Base
 #Source0:      ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
@@ -18,7 +18,7 @@ Source0:      %{name}-%{version}.tar.gz
 Source1:       rc-scripts-systemd-tmpfiles.d.conf
 Source2:       rc-local.service
 URL:           http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
-#Patch0:               %{name}-svn.patch
+Patch0:                %{name}-svn.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
@@ -117,7 +117,7 @@ programcıklar içerir.
 
 %prep
 %setup -q
-#%patch0 -p0
+%patch0 -p0
 
 # hack, currently this results -lgcc_s not found error:
 #GLIB_LIBS="-Wl,-static `$PKG_CONFIG --libs --static glib-2.0` -Wl,-Bdynamic"