30 lines
1.0 KiB
Diff
30 lines
1.0 KiB
Diff
|
From 6d8f91ab2f7db862d95d0565bad3aaf4279c00bc Mon Sep 17 00:00:00 2001
|
||
|
|
From: Luca Boccassi <bluca@debian.org>
|
||
|
|
Date: Thu, 3 Nov 2022 20:10:57 +0000
|
||
|
|
Subject: [PATCH] tmpfiles.d: do not fail if provision.conf fails
|
||
|
|
|
||
|
|
On a read-only filesystem creating /root/.ssh might fail, but that's ok.
|
||
|
|
Do not fail the run, as this is only needed to add the credential, which
|
||
|
|
is a separate step.
|
||
|
|
|
||
|
|
(cherry picked from commit e0fc9be37e4d15e2c322eb8281692c2639dac023)
|
||
|
|
|
||
|
|
Related #2138081
|
||
|
|
---
|
||
|
|
tmpfiles.d/provision.conf | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tmpfiles.d/provision.conf b/tmpfiles.d/provision.conf
|
||
|
|
index 3c56f42d58..093104aaaf 100644
|
||
|
|
--- a/tmpfiles.d/provision.conf
|
||
|
|
+++ b/tmpfiles.d/provision.conf
|
||
|
|
@@ -17,6 +17,6 @@ f^ /etc/issue.d/50-provision.conf - - - - login.issue
|
||
|
|
f^ /etc/hosts - - - - network.hosts
|
||
|
|
|
||
|
|
# Provision SSH key for root
|
||
|
|
-d /root :0700 root :root -
|
||
|
|
-d /root/.ssh :0700 root :root -
|
||
|
|
+d- /root :0700 root :root -
|
||
|
|
+d- /root/.ssh :0700 root :root -
|
||
|
|
f^ /root/.ssh/authorized_keys :0600 root :root - ssh.authorized_keys.root
|