commit 0ee7256f54225363534d303d9aea358daaf82ae4
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Thu Aug 9 23:36:41 2018 +0200
- rel 6; apply git patch
rc-scripts-git.patch | 66 ----------------------------------------------------
rc-scripts.spec | 4 ++--
2 files changed, 2 insertions(+), 68 deletions(-)
---
diff --git a/rc-scripts.spec b/rc-scripts.spec
index 8ec2e41..ad8205e 100644
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -11,7 +11,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.16
-Release: 5
+Release: 6
License: GPL v2
Group: Base
#Source0: ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
@@ -141,7 +141,7 @@ po cichu ignorowane.
%prep
%setup -q
-#%patch0 -p1
+%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
diff --git a/rc-scripts-git.patch b/rc-scripts-git.patch
index 1e6cf1f..25428a9 100644
--- a/rc-scripts-git.patch
+++ b/rc-scripts-git.patch
@@ -1,69 +1,3 @@
-diff --git a/lib/functions b/lib/functions
-index 8d018f7..f9538d2 100644
---- a/lib/functions
-+++ b/lib/functions
-@@ -690,13 +690,12 @@ _daemon_exec() {
- --exec "$prog" \
- -- "$@"
- else
--
-- if [ "$makepid" ] && [ "$pidfile" ]; then
-- export PIDFILE="$pidfile"
-- set -- /lib/rc-scripts/makepid "$@"
-- fi
--
- if [ "$fork" = "1" ]; then
-+ export PIDFILE="/dev/null"
-+ if [ "$makepid" ] && [ "$pidfile" ]; then
-+ export PIDFILE="$pidfile"
-+ fi
-+ set -- /lib/rc-scripts/makepid "$@"
- set -- /usr/bin/setsid "$@"
- fi
- if [ -n "$user" -a "$user" != "root" ]; then
-@@ -1009,7 +1008,7 @@ pidofproc() {
- fi
-
- # Next try "pidof" if pidfile is not specified
-- if [ -z "$pid" ] && [ -z "$pidfile" ]; then
-+ if [ -z "$pid" ] && [ -z "$2" ]; then
- pid=$(pidof -o $$ -o $PPID -o %PPID -x "$1")
- fi
-
-commit bf42a4fb7c71c31954499bf9cbce4548305afe80
-Author: Arkadiusz Miśkiewicz <[email protected]>
-Date: Tue Jun 7 17:09:48 2016 +0200
-
- Mount /run as mode=0755,noexec,nosuid,nodev.
-
-diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
-index f7f0eea..99bb078 100755
---- a/rc.d/rc.sysinit
-+++ b/rc.d/rc.sysinit
-@@ -409,7 +409,7 @@ if ! is_yes "$VSERVER" && [[ "$container" != lxc* ]]; then
- parse_cmdline
-
- if [ -d /run ]; then
-- is_fsmounted tmpfs /run || mount -n -t tmpfs run /run
-+ is_fsmounted tmpfs /run || mount -n -t tmpfs run /run -o
mode=0755,noexec,nosuid,nodev
- fi
-
- # Early sysctls
-@@ -680,7 +680,7 @@ if ! is_yes "$VSERVER" && [[ "$container" != lxc* ]]; then
- mount -f -t devtmpfs devtmpfs /dev 2> /dev/null
- fi
- if is_fsmounted tmpfs /run; then
-- mount -f -t tmpfs run /run 2> /dev/null
-+ mount -f -t tmpfs run /run -o mode=0755,noexec,nosuid,nodev 2>
/dev/null
- fi
-
- if is_fsmounted usbfs /proc/bus/usb; then
-commit 8903a3b15f08d759d06bb2b02e637e0baf7497bf
-Author: Arkadiusz Miśkiewicz <[email protected]>
-Date: Tue Jul 3 15:13:45 2018 +0200
-
- Don't fail if arrays are already assembled (ex raid10 with 4 devices, one
device gets removed/kicked from array).
-
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 99bb078..6fdca19 100755
--- a/rc.d/rc.sysinit
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rc-scripts.git/commitdiff/0ee7256f54225363534d303d9aea358daaf82ae4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
