Drop patch, applied upstream
This commit is contained in:
parent
a84ad725aa
commit
64635bf40f
|
|
@ -1,42 +0,0 @@
|
||||||
From: Simon McVittie <smcv@collabora.com>
|
|
||||||
Date: Fri, 21 Aug 2020 09:14:36 +0100
|
|
||||||
Subject: boot: Replace deprecated StandardOutput=syslog with journal, etc.
|
|
||||||
|
|
||||||
systemd deprecated this in v246.
|
|
||||||
|
|
||||||
Bug: https://github.com/ostreedev/ostree/issues/2169
|
|
||||||
Forwarded: https://github.com/ostreedev/ostree/pull/2177
|
|
||||||
Signed-off-by: Simon McVittie <smcv@collabora.com>
|
|
||||||
---
|
|
||||||
src/boot/ostree-prepare-root.service | 4 ++--
|
|
||||||
src/boot/ostree-remount.service | 4 ++--
|
|
||||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/boot/ostree-prepare-root.service b/src/boot/ostree-prepare-root.service
|
|
||||||
index 9169220..250ffe7 100644
|
|
||||||
--- a/src/boot/ostree-prepare-root.service
|
|
||||||
+++ b/src/boot/ostree-prepare-root.service
|
|
||||||
@@ -30,6 +30,6 @@ Before=initrd-root-fs.target
|
|
||||||
Type=oneshot
|
|
||||||
ExecStart=/usr/lib/ostree/ostree-prepare-root /sysroot
|
|
||||||
StandardInput=null
|
|
||||||
-StandardOutput=syslog
|
|
||||||
-StandardError=syslog+console
|
|
||||||
+StandardOutput=journal
|
|
||||||
+StandardError=journal+console
|
|
||||||
RemainAfterExit=yes
|
|
||||||
diff --git a/src/boot/ostree-remount.service b/src/boot/ostree-remount.service
|
|
||||||
index 4c3ed94..af40453 100644
|
|
||||||
--- a/src/boot/ostree-remount.service
|
|
||||||
+++ b/src/boot/ostree-remount.service
|
|
||||||
@@ -35,8 +35,8 @@ Type=oneshot
|
|
||||||
RemainAfterExit=yes
|
|
||||||
ExecStart=/usr/lib/ostree/ostree-remount
|
|
||||||
StandardInput=null
|
|
||||||
-StandardOutput=syslog
|
|
||||||
-StandardError=syslog+console
|
|
||||||
+StandardOutput=journal
|
|
||||||
+StandardError=journal+console
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=local-fs.target
|
|
||||||
|
|
@ -1,2 +1 @@
|
||||||
debian/Skip-test-pull-repeated-during-CI.patch
|
debian/Skip-test-pull-repeated-during-CI.patch
|
||||||
boot-Replace-deprecated-StandardOutput-syslog-with-journa.patch
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue