|
 |
ba9a699 |
From b9dd6b7826fdc540365776b860fe5190c51ab088 Mon Sep 17 00:00:00 2001
|
|
|
bbe011b |
From: Peter Jones <pjones@redhat.com>
|
|
|
bbe011b |
Date: Fri, 12 Jun 2020 11:49:44 -0400
|
|
|
ba9a699 |
Subject: [PATCH 04/42] Rename /var/run/ to /run/
|
|
|
bbe011b |
|
|
|
bbe011b |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
bbe011b |
---
|
|
|
bbe011b |
src/macros.pesign | 12 ++++++------
|
|
|
bbe011b |
src/tmpfiles.conf | 2 +-
|
|
|
bbe011b |
2 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
bbe011b |
|
|
|
bbe011b |
diff --git a/src/macros.pesign b/src/macros.pesign
|
|
|
ff0566d |
index 7c5cba170e9..21bf3917795 100644
|
|
|
bbe011b |
--- a/src/macros.pesign
|
|
|
bbe011b |
+++ b/src/macros.pesign
|
|
|
bbe011b |
@@ -45,14 +45,14 @@
|
|
|
bbe011b |
rm -rf ${sattrs} ${sattrs}.sig ${nss} \
|
|
|
bbe011b |
elif [ "$(id -un)" == "kojibuilder" -a \\\
|
|
|
bbe011b |
grep -q ID=fedora /etc/os-release -a \\\
|
|
|
bbe011b |
- ! -S /var/run/pesign/socket ]; then \
|
|
|
bbe011b |
+ ! -S /run/pesign/socket ]; then \
|
|
|
bbe011b |
echo "No socket even though this is kojibuilder" 1>&2 \
|
|
|
bbe011b |
- ls -ld /var/run/pesign 1>&2 \
|
|
|
bbe011b |
- ls -l /var/run/pesign/socket 1>&2 \
|
|
|
bbe011b |
- getfacl /var/run/pesign 1>&2 \
|
|
|
bbe011b |
- getfacl /var/run/pesign/socket 1>&2 \
|
|
|
bbe011b |
+ ls -ld /run/pesign 1>&2 \
|
|
|
bbe011b |
+ ls -l /run/pesign/socket 1>&2 \
|
|
|
bbe011b |
+ getfacl /run/pesign 1>&2 \
|
|
|
bbe011b |
+ getfacl /run/pesign/socket 1>&2 \
|
|
|
bbe011b |
exit 1 \
|
|
|
bbe011b |
- elif [ -S /var/run/pesign/socket ]; then \
|
|
|
bbe011b |
+ elif [ -S /run/pesign/socket ]; then \
|
|
|
bbe011b |
%{_pesign_client} -t %{__pesign_client_token} \\\
|
|
|
bbe011b |
-c %{__pesign_client_cert} \\\
|
|
|
bbe011b |
%{-i} %{-o} %{-e} %{-s} %{-C} \
|
|
|
bbe011b |
diff --git a/src/tmpfiles.conf b/src/tmpfiles.conf
|
|
|
bbe011b |
index c1cf35597d8..3375ad52a44 100644
|
|
|
bbe011b |
--- a/src/tmpfiles.conf
|
|
|
bbe011b |
+++ b/src/tmpfiles.conf
|
|
|
bbe011b |
@@ -1 +1 @@
|
|
|
bbe011b |
-D /var/run/pesign 0770 pesign pesign -
|
|
|
bbe011b |
+D /run/pesign 0770 pesign pesign -
|
|
|
bbe011b |
--
|
|
|
ff0566d |
2.29.2
|
|
|
bbe011b |
|