summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-03-03 14:57:03 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-03-03 15:02:53 +0100
commit33eb1f24978c813994357c27efd0e99f491e7c55 (patch)
tree7573a5b4d05d87759918488b83e2de5814d3a755
parenta345d5c1c9b223adb513e7cd7663bdb7277a3f38 (diff)
downloadsystemd-33eb1f24978c813994357c27efd0e99f491e7c55.tar.gz
tree-wide: drop printk.devkmsg=on setting in various places
Since 6123dfaa72 this should not be necessary anymore.
-rw-r--r--.mkosi/mkosi.fedora1
-rw-r--r--man/journald.conf.xml6
-rw-r--r--test/mkosi.default.networkd-test1
-rw-r--r--test/test-functions1
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 \
"