patches/finit: resync hwrng support and tmpfiles.d logging fix

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2024-03-13 12:08:54 +01:00
parent 8bd8195660
commit 68fac03f09
2 changed files with 44 additions and 4 deletions
@@ -1,7 +1,7 @@
From 49218a66e8eae8db1e285bbf8b55ac7109fa7c6c Mon Sep 17 00:00:00 2001
From bf4a584e2ebfa512a2d6cfe5e43a81ee741e3296 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Tue, 12 Mar 2024 05:18:35 +0100
Subject: [PATCH 6/6] plugins: add support for hwrng and check if seed file is
Subject: [PATCH 6/7] plugins: add support for hwrng and check if seed file is
empty
Organization: Addiva Elektronik
@@ -11,7 +11,7 @@ Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
1 file changed, 30 insertions(+), 11 deletions(-)
diff --git a/plugins/urandom.c b/plugins/urandom.c
index 64a3fa7..0f4ec0c 100644
index 64a3fa7..2da8035 100644
--- a/plugins/urandom.c
+++ b/plugins/urandom.c
@@ -47,6 +47,7 @@ static void setup(void *arg)
@@ -27,7 +27,7 @@ index 64a3fa7..0f4ec0c 100644
}
- if (!fexist(RANDOMSEED)) {
+ if (!stat(RANDOMSEED, &st) || st.st_size < 512) {
+ if (stat(RANDOMSEED, &st) || st.st_size < 512) {
int ret = 1;
mode_t prev;
FILE *fp;
@@ -0,0 +1,40 @@
From b49f55ab3d1aec48bbfdf2106fd8f500406a5348 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Wed, 13 Mar 2024 11:48:47 +0100
Subject: [PATCH 7/7] tmpfiles.d: ignore x/X command, no cleanup at runtime
with Finit
Organization: Addiva Elektronik
Silence log warnings for command x/X (ignore clean for path), because
Finit does not do tmpfiles cleaning at runtime.
x /tmp/podman-run-*
x /tmp/containers-user-*
x /tmp/run-*/libpod
D! /var/lib/containers/storage/tmp 0700 root root
D! /run/podman 0700 root root
D! /var/lib/cni/networks
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
src/tmpfiles.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/tmpfiles.c b/src/tmpfiles.c
index d62b09f..15b463c 100644
--- a/src/tmpfiles.c
+++ b/src/tmpfiles.c
@@ -434,6 +434,10 @@ static void tmpfiles(char *line)
}
}
break;
+ case 'X':
+ case 'x':
+ dbg("Unsupported x/X command, ignoring %s, no support for clean at runtime.", path);
+ break;
case 'Z':
opts = "-R";
/* fallthrough */
--
2.34.1