|
 |
c81bb39 |
From db4c6e8cc57271dce6d204a3144982e544e55025 Mon Sep 17 00:00:00 2001
|
|
|
c81bb39 |
From: Peter Jones <pjones@redhat.com>
|
|
|
c81bb39 |
Date: Thu, 16 Jul 2020 16:28:26 -0400
|
|
|
c81bb39 |
Subject: [PATCH] Use /run not /var/run
|
|
|
c81bb39 |
|
|
|
c81bb39 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
c81bb39 |
---
|
|
|
c81bb39 |
src/daemon.h | 4 ++--
|
|
|
c81bb39 |
src/Makefile | 2 +-
|
|
|
c81bb39 |
src/pesign-authorize | 2 +-
|
|
|
c81bb39 |
src/pesign.service.in | 2 +-
|
|
|
c81bb39 |
src/pesign.sysvinit.in | 10 +++++-----
|
|
|
c81bb39 |
5 files changed, 10 insertions(+), 10 deletions(-)
|
|
|
c81bb39 |
|
|
|
c81bb39 |
diff --git a/src/daemon.h b/src/daemon.h
|
|
|
c81bb39 |
index 0368dc9256c..5fcd97ea717 100644
|
|
|
c81bb39 |
--- a/src/daemon.h
|
|
|
c81bb39 |
+++ b/src/daemon.h
|
|
|
c81bb39 |
@@ -51,8 +51,8 @@ typedef enum {
|
|
|
c81bb39 |
} pesignd_cmd;
|
|
|
c81bb39 |
|
|
|
c81bb39 |
#define PESIGND_VERSION 0x2a9edaf0
|
|
|
c81bb39 |
-#define SOCKPATH "/var/run/pesign/socket"
|
|
|
c81bb39 |
-#define PIDFILE "/var/run/pesign.pid"
|
|
|
c81bb39 |
+#define SOCKPATH "/run/pesign/socket"
|
|
|
c81bb39 |
+#define PIDFILE "/run/pesign.pid"
|
|
|
c81bb39 |
|
|
|
c81bb39 |
static inline uint32_t UNUSED
|
|
|
c81bb39 |
pesignd_string_size(char *buffer)
|
|
|
c81bb39 |
diff --git a/src/Makefile b/src/Makefile
|
|
|
c81bb39 |
index a7ca89159c6..f7fb5fc9ee5 100644
|
|
|
c81bb39 |
--- a/src/Makefile
|
|
|
c81bb39 |
+++ b/src/Makefile
|
|
|
c81bb39 |
@@ -78,7 +78,7 @@ install_sysvinit: pesign.sysvinit
|
|
|
c81bb39 |
install :
|
|
|
c81bb39 |
$(INSTALL) -d -m 700 $(INSTALLROOT)/etc/pki/pesign/
|
|
|
c81bb39 |
$(INSTALL) -d -m 700 $(INSTALLROOT)/etc/pki/pesign-rh-test/
|
|
|
c81bb39 |
- $(INSTALL) -d -m 770 $(INSTALLROOT)/var/run/pesign/
|
|
|
c81bb39 |
+ $(INSTALL) -d -m 770 $(INSTALLROOT)/run/pesign/
|
|
|
c81bb39 |
$(INSTALL) -d -m 755 $(INSTALLROOT)$(bindir)
|
|
|
c81bb39 |
$(INSTALL) -m 755 authvar $(INSTALLROOT)$(bindir)
|
|
|
c81bb39 |
$(INSTALL) -m 755 pesign $(INSTALLROOT)$(bindir)
|
|
|
c81bb39 |
diff --git a/src/pesign-authorize b/src/pesign-authorize
|
|
|
c81bb39 |
index c5448329c2c..2381302440c 100755
|
|
|
c81bb39 |
--- a/src/pesign-authorize
|
|
|
c81bb39 |
+++ b/src/pesign-authorize
|
|
|
c81bb39 |
@@ -47,7 +47,7 @@ update_subdir() {
|
|
|
c81bb39 |
done
|
|
|
c81bb39 |
}
|
|
|
c81bb39 |
|
|
|
c81bb39 |
-for x in /var/run/pesign/ /etc/pki/pesign/ ; do
|
|
|
c81bb39 |
+for x in /run/pesign/ /var/run/pesign/ /etc/pki/pesign/ ; do
|
|
|
c81bb39 |
if [ -d "${x}" ]; then
|
|
|
c81bb39 |
update_subdir "${x}"
|
|
|
c81bb39 |
else
|
|
|
c81bb39 |
diff --git a/src/pesign.service.in b/src/pesign.service.in
|
|
|
c81bb39 |
index c75a000892a..4ac2199bce2 100644
|
|
|
c81bb39 |
--- a/src/pesign.service.in
|
|
|
c81bb39 |
+++ b/src/pesign.service.in
|
|
|
c81bb39 |
@@ -4,6 +4,6 @@ Description=Pesign signing daemon
|
|
|
c81bb39 |
[Service]
|
|
|
c81bb39 |
PrivateTmp=true
|
|
|
c81bb39 |
Type=forking
|
|
|
c81bb39 |
-PIDFile=/var/run/pesign.pid
|
|
|
c81bb39 |
+PIDFile=/run/pesign.pid
|
|
|
c81bb39 |
ExecStart=/usr/bin/pesign --daemonize
|
|
|
c81bb39 |
ExecStartPost=@@LIBEXECDIR@@/pesign/pesign-authorize
|
|
|
c81bb39 |
diff --git a/src/pesign.sysvinit.in b/src/pesign.sysvinit.in
|
|
|
c81bb39 |
index b0e0f84ff0b..bf8edec8ff3 100644
|
|
|
c81bb39 |
--- a/src/pesign.sysvinit.in
|
|
|
c81bb39 |
+++ b/src/pesign.sysvinit.in
|
|
|
c81bb39 |
@@ -4,7 +4,7 @@
|
|
|
c81bb39 |
#
|
|
|
c81bb39 |
# chkconfig: - 50 50
|
|
|
c81bb39 |
# processname: /usr/bin/pesign
|
|
|
c81bb39 |
-# pidfile: /var/run/pesign.pid
|
|
|
c81bb39 |
+# pidfile: /run/pesign.pid
|
|
|
c81bb39 |
### BEGIN INIT INFO
|
|
|
c81bb39 |
# Provides: pesign
|
|
|
c81bb39 |
# Default-Start:
|
|
|
c81bb39 |
@@ -20,9 +20,9 @@ RETVAL=0
|
|
|
c81bb39 |
|
|
|
c81bb39 |
start(){
|
|
|
c81bb39 |
echo -n "Starting pesign: "
|
|
|
c81bb39 |
- mkdir /var/run/pesign 2>/dev/null &&
|
|
|
c81bb39 |
- chown pesign:pesign /var/run/pesign &&
|
|
|
c81bb39 |
- chmod 0770 /var/run/pesign
|
|
|
c81bb39 |
+ mkdir /run/pesign 2>/dev/null &&
|
|
|
c81bb39 |
+ chown pesign:pesign /run/pesign &&
|
|
|
c81bb39 |
+ chmod 0770 /run/pesign
|
|
|
c81bb39 |
daemon /usr/bin/pesign --daemonize
|
|
|
c81bb39 |
RETVAL=$?
|
|
|
c81bb39 |
echo
|
|
|
c81bb39 |
@@ -32,7 +32,7 @@ start(){
|
|
|
c81bb39 |
|
|
|
c81bb39 |
stop(){
|
|
|
c81bb39 |
echo -n "Stopping pesign: "
|
|
|
c81bb39 |
- killproc -p /var/run/pesign.pid pesignd
|
|
|
c81bb39 |
+ killproc -p /run/pesign.pid pesignd
|
|
|
c81bb39 |
RETVAL=$?
|
|
|
c81bb39 |
echo
|
|
|
c81bb39 |
rm -f /var/lock/subsys/pesign
|
|
|
c81bb39 |
--
|
|
|
c81bb39 |
2.26.2
|
|
|
c81bb39 |
|