proxmox-mirrors/systemd
1
0
Fork 0
mirror of https://git.proxmox.com/git/systemd synced 2026-01-27 20:56:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rebase patches

Browse Source
This commit is contained in:
Michael Biebl 2021-08-30 10:31:12 +02:00
parent 23f1581d26
commit 13aa99dc6b
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/patches/debian/Don-t-enable-audit-by-default.patch vendored
View File

@ -29,10 +29,10 @@ index ed7e428..0abed9c 100644
<varlistentry>
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index e8ab89d..c001681 100644
index 7eef9de..5860e1e 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -2190,7 +2190,7 @@ int server_init(Server *s, const char *namespace) {
@@ -2197,7 +2197,7 @@ int server_init(Server *s, const char *namespace) {
.compress.threshold_bytes = UINT64_MAX,
.seal = true,

4
debian/patches/debian/Re-enable-journal-forwarding-to-syslog.patch vendored
View File

@ -30,10 +30,10 @@ index 4b0dd90..ed7e428 100644
<literal>systemd.journald.forward_to_kmsg</literal>,
<literal>systemd.journald.forward_to_console</literal>, and
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 30f04f5..e8ab89d 100644
index a0695ec..7eef9de 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -2200,6 +2200,7 @@ int server_init(Server *s, const char *namespace) {
@@ -2207,6 +2207,7 @@ int server_init(Server *s, const char *namespace) {
.ratelimit_interval = DEFAULT_RATE_LIMIT_INTERVAL,
.ratelimit_burst = DEFAULT_RATE_LIMIT_BURST,

4
debian/patches/debian/Revert-core-one-step-back-again-for-nspawn-we-actual.patch vendored
View File

@ -14,10 +14,10 @@ Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1141137
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/src/core/unit.c b/src/core/unit.c
index 47966bc..6066990 100644
index 38d3eb7..a6733ad 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -4557,16 +4557,7 @@ int unit_kill_context(
@@ -4565,16 +4565,7 @@ int unit_kill_context(
} else if (r > 0) {

4
debian/patches/debian/Skip-filesystem-check-if-already-done-by-the-initram.patch vendored
View File

@ -15,7 +15,7 @@ Closes: #810748
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index a4e3ea5..0518387 100644
index b6582c9..e1a1200 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -357,6 +357,7 @@ static int add_mount(
@ -26,7 +26,7 @@ index a4e3ea5..0518387 100644
assert(what);
assert(where);
@@ -439,9 +440,13 @@ static int add_mount(
@@ -440,9 +441,13 @@ static int add_mount(
fprintf(f, "Before=%s\n", post);
if (passno != 0) {