Attachment 7938 Details for Bug 35885 – Миграция на /run и /run/lock

[patch] Миграция на /run и /run/lock

run-migration.patch (text/plain), 3.98 KB, created by Антон Мидюков on 2019-01-12 16:40:45 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Антон Мидюков

Created: 2019-01-12 16:40:45 MSK

Size: 3.98 KB

patch

obsolete

>diff --git a/.gear/rules b/.gear/rules
>index ea8524739..bc9c9dfa9 100644
>--- a/.gear/rules
>+++ b/.gear/rules
>@@ -1,3 +1,3 @@
> tar: v@version@:.
> diff: v@version@:. . name=@name@-@version@.patch
>-
>+copy?: *.patch
>diff --git a/replaced-rundir-8.39.0.patch b/replaced-rundir-8.39.0.patch
>new file mode 100644
>index 000000000..a96c51360
>--- /dev/null
>+++ b/replaced-rundir-8.39.0.patch
>@@ -0,0 +1,69 @@
>+diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
>+index 1618fde94..a236dab69 100644
>+--- a/plugins/imuxsock/imuxsock.c
>++++ b/plugins/imuxsock/imuxsock.c
>+@@ -75,7 +75,7 @@ MODULE_CNFNAME("imuxsock")
>+ /* defines */
>+ #ifndef _PATH_LOG
>+ #ifdef BSD
>+-#define _PATH_LOG	"/var/run/log"
>++#define _PATH_LOG	"/run/log"
>+ #else
>+ #define _PATH_LOG	"/dev/log"
>+ #endif
>+diff --git a/tools/omfwd.c b/tools/omfwd.c
>+index e063f2e6b..62027efa3 100644
>+--- a/tools/omfwd.c
>++++ b/tools/omfwd.c
>+@@ -798,7 +798,7 @@ static rsRetVal changeToNs(instanceData *const pData __attribute__((unused)))
>+ 		}
>+ 
>+ 		/* build network namespace path */
>+-		if (asprintf(&nsPath, "/var/run/netns/%s", pData->networkNamespace) == -1) {
>++		if (asprintf(&nsPath, "/run/netns/%s", pData->networkNamespace) == -1) {
>+ 			LogError(0, RS_RET_OUT_OF_MEMORY, "omfwd: asprintf failed");
>+ 			ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY);
>+ 		}
>+diff --git a/tools/rsyslogd.8 b/tools/rsyslogd.8
>+index 2b320f859..788564d71 100644
>+--- a/tools/rsyslogd.8
>++++ b/tools/rsyslogd.8
>+@@ -128,14 +128,14 @@ reacts to a set of signals.  You may easily send a signal to
>+ using the following:
>+ .IP
>+ .nf
>+-kill -SIGNAL $(cat /var/run/rsyslogd.pid)
>++kill -SIGNAL $(cat /run/rsyslogd.pid)
>+ .fi
>+ .PP
>+ Note that -SIGNAL must be replaced with the actual signal
>+ you are trying to send, e.g. with HUP. So it then becomes:
>+ .IP
>+ .nf
>+-kill -HUP $(cat /var/run/rsyslogd.pid)
>++kill -HUP $(cat /run/rsyslogd.pid)
>+ .fi
>+ .PP
>+ .TP
>+@@ -216,7 +216,7 @@ for exact information.
>+ .I /dev/log
>+ The Unix domain socket to from where local syslog messages are read.
>+ .TP
>+-.I /var/run/rsyslogd.pid
>++.I /run/rsyslogd.pid
>+ The file containing the process id of 
>+ .BR rsyslogd .
>+ .TP
>+diff --git a/tools/rsyslogd.c b/tools/rsyslogd.c
>+index fe5dff890..788fa1839 100644
>+--- a/tools/rsyslogd.c
>++++ b/tools/rsyslogd.c
>+@@ -155,7 +155,7 @@ void rsyslogdDoDie(int sig);
>+ #if defined(_AIX)  /* AIXPORT : Add _AIX */
>+ #	define PATH_PIDFILE "/etc/rsyslogd.pid"
>+ #else
>+-#	define PATH_PIDFILE "/var/run/rsyslogd.pid"
>++#	define PATH_PIDFILE "/run/rsyslogd.pid"
>+ #endif /*_AIX*/
>+ #endif
>+ 
>diff --git a/rsyslog.classic.conf.d b/rsyslog.classic.conf.d
>index 165ad9273..4c0f36cf8 100644
>--- a/rsyslog.classic.conf.d
>+++ b/rsyslog.classic.conf.d
>@@ -3,8 +3,8 @@ After=syslog.socket
> 
> [Service]
> ExecStartPre=/lib/systemd/altlinux-rsyslog-extrasockets
>-ExecStartPost=/bin/touch /var/lock/subsys/rsyslogd
>-ExecStopPost=/bin/rm -f /var/lock/subsys/rsyslogd
>+ExecStartPost=/bin/touch /run/lock/subsys/rsyslogd
>+ExecStopPost=/bin/rm -f /run/lock/subsys/rsyslogd
> 
> [Install]
> Alias=syslog.service
>diff --git a/rsyslog.spec b/rsyslog.spec
>index 20b86d92c..97fea6818 100644
>--- a/rsyslog.spec
>+++ b/rsyslog.spec
>@@ -16,7 +16,7 @@
> 
> Name: rsyslog
> Version: 8.39.0
>-Release: alt1
>+Release: alt2
> 
> Summary: Enhanced system logging and kernel message trapping daemon
> License: GPLv3+ ASL2.0
>@@ -25,6 +25,7 @@ Url: http://www.rsyslog.com
> # https://github.com/rsyslog/rsyslog.git
> Source: %name-%version.tar
> Patch: %name-%version.patch
>+Patch1: replaced-rundir-8.39.0.patch
> 
> BuildRequires: flex
> BuildRequires: zlib-devel
>@@ -356,6 +357,7 @@ all other functions:
> %prep
> %setup -q
> %patch -p1
>+%patch1 -p1
> 
> %build
> %autoreconf
>diff --git a/rsyslogd.init b/rsyslogd.init
>index 244458da2..55ae58e96 100755
>--- a/rsyslogd.init
>+++ b/rsyslogd.init
>@@ -30,8 +30,8 @@ SourceIfNotEmpty /etc/sysconfig/rsyslogd
> RSYSLOGD=/sbin/rsyslogd
> [ -x "$RSYSLOGD" ] || exit
> 
>-PIDFILE=/var/run/rsyslogd.pid
>-LOCKFILE=/var/lock/subsys/rsyslogd
>+PIDFILE=/run/rsyslogd.pid
>+LOCKFILE=/run/lock/subsys/rsyslogd
> RETVAL=0
> 
> extrasockets()

Actions: View | Diff

Attachments on bug 35885: 7938