From 33eb1f24978c813994357c27efd0e99f491e7c55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 3 Mar 2020 14:57:03 +0100
Subject: [PATCH] tree-wide: drop printk.devkmsg=on setting in various places

Since 6123dfaa72 this should not be necessary anymore.
---
 .mkosi/mkosi.fedora              | 1 -
 man/journald.conf.xml            | 6 +++---
 test/mkosi.default.networkd-test | 1 -
 test/test-functions              | 1 -
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.mkosi/mkosi.fedora b/.mkosi/mkosi.fedora
index 7d07140e6e..01bfd2338b 100644
--- a/.mkosi/mkosi.fedora
+++ b/.mkosi/mkosi.fedora
@@ -10,7 +10,6 @@ Release=31
 [Output]
 Format=gpt_ext4
 Bootable=yes
-KernelCommandLine=printk.devkmsg=on
 
 [Partitions]
 RootSize=3G
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index afbbe64bb8..e24c420ab0 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -350,9 +350,9 @@
         <varname>TTYPath=</varname>, described below.</para>
 
         <para>When forwarding to the kernel log buffer (kmsg), make sure to select a suitably large size for
-        the log buffer, and ensure the kernel's rate-limiting applied to userspace processes is turned
-        off. Specifically, add <literal>log_buf_len=8M</literal> and <literal>printk.devkmsg=on</literal> (or
-        similar) to the kernel command line.</para></listitem>
+        the log buffer, for example by adding <literal>log_buf_len=8M</literal> to the kernel command line.
+        <command>systemd</command> will automatically disable kernel's rate-limiting applied to userspace
+        processes (equivalent to setting <literal>printk.devkmsg=on</literal>).</para></listitem>
       </varlistentry>
 
       <varlistentry>
diff --git a/test/mkosi.default.networkd-test b/test/mkosi.default.networkd-test
index 58af352f6f..6032c33c3a 100644
--- a/test/mkosi.default.networkd-test
+++ b/test/mkosi.default.networkd-test
@@ -10,7 +10,6 @@ Release=29
 [Output]
 Format=raw_btrfs
 Bootable=yes
-KernelCommandLine=printk.devkmsg=on
 OutputDirectory=../mkosi.output
 Output=networkd-test.raw
 
diff --git a/test/test-functions b/test/test-functions
index 1bba8e429b..e4ec4f025f 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -212,7 +212,6 @@ loglevel=2 \
 init=$PATH_TO_INIT \
 console=$CONSOLE \
 selinux=0 \
-printk.devkmsg=on \
 $_cgroup_args \
 $KERNEL_APPEND \
 "