getty: remove --issue-file parameter

agetty from util-linux is meanwhile following the configuration file
specification for /etc/issue. The usage of "--issue-file" breaks this
on distributions with current util-linux.

diff --git a/README b/README
index 1bbcd5f671ccc2ec62a58d79baf5b480807bb637..a5e616372187ad3fef40dcbf4d19aeb5f870cd54 100644 (file)
--- a/README
+++ b/README
@@ -259,9 +259,9 @@ REQUIREMENTS:
         During runtime, you need the following additional
         dependencies:
 
-        util-linux >= v2.27.1 required (including but not limited to: mount,
-                                        umount, swapon, swapoff, sulogin,
-                                        agetty, fsck)
+        util-linux >= v2.41 required (including but not limited to: mount,
+                                      umount, swapon, swapoff, sulogin,
+                                      agetty, fsck)
         dbus >= 1.4.0 (strictly speaking optional, but recommended)
                 NOTE: If using dbus < 1.9.18, you should override the default
                 policy directory (--with-dbuspolicydir=/etc/dbus-1/system.d).

diff --git a/TODO b/TODO
index 321e4f454a1d3ec38769cf4c1418264944e45fbd..090bbf0e548f0fdaba6beb5fa4efdf78d533a405 100644 (file)
--- a/TODO
+++ b/TODO
@@ -116,10 +116,6 @@ Deprecations and removals:
 
 * Consider removing root=gpt-auto, and push people to use root=dissect instead.
 
-* Once
-  https://github.com/util-linux/util-linux/commit/508fb0e7ac103b68531a59db2a4473897853ab52
-  has hit the prominent distributions, revert --issue-file= hack in units/*getty*service.in
-
 Features:
 
 * Maybe introducean InodeRef structure inspired by PidRef, which references a

diff --git a/units/console-getty.service.in b/units/console-getty.service.in
index d28fddbc03953c8a3ff9cff6bffe3b2de3613ca1..947346aebc43981f8cc31f196018551d98395216 100644 (file)
--- a/units/console-getty.service.in
+++ b/units/console-getty.service.in
@@ -17,7 +17,7 @@ Before=getty.target
 ConditionPathExists=/dev/console
 
 [Service]
-ExecStart=-{{AGETTY}} --noreset --noclear --issue-file=/etc/issue:/etc/issue.d:/run/issue.d:/usr/lib/issue.d --keep-baud 115200,57600,38400,9600 - ${TERM}
+ExecStart=-{{AGETTY}} --noreset --noclear --keep-baud 115200,57600,38400,9600 - ${TERM}
 Type=idle
 Restart=always
 UtmpIdentifier=cons

diff --git a/units/container-getty@.service.in b/units/container-getty@.service.in
index 839a76c73f8d45aa799a97e921cd871175207a6b..1bd0edcd66e913d14d5b36e51d18f63062bf803a 100644 (file)
--- a/units/container-getty@.service.in
+++ b/units/container-getty@.service.in
@@ -22,7 +22,7 @@ Conflicts=rescue.service
 Before=rescue.service
 
 [Service]
-ExecStart=-{{AGETTY}} --noreset --noclear --issue-file=/etc/issue:/etc/issue.d:/run/issue.d:/usr/lib/issue.d - ${TERM}
+ExecStart=-{{AGETTY}} --noreset --noclear - ${TERM}
 Type=idle
 Restart=always
 RestartSec=0

diff --git a/units/getty@.service.in b/units/getty@.service.in
index e7e2aab045fd9a757d1ae9892d46c32aa38b1eb8..2a7ff07bb9cdda5dfd6c8dd7327889e6f156efe9 100644 (file)
--- a/units/getty@.service.in
+++ b/units/getty@.service.in
@@ -31,7 +31,7 @@ Before=rescue.service
 ConditionPathExists=/dev/tty0
 
 [Service]
-ExecStart=-{{AGETTY}} --noreset --noclear --issue-file=/etc/issue:/etc/issue.d:/run/issue.d:/usr/lib/issue.d - ${TERM}
+ExecStart=-{{AGETTY}} --noreset --noclear - ${TERM}
 Type=idle
 Restart=always
 RestartSec=0

diff --git a/units/serial-getty@.service.in b/units/serial-getty@.service.in
index 01c6b0abb235e6b0457888a40e00f096b3a1cf2b..d89805a0ef6b8ca1217ef9a6d4d315bb3de0ada1 100644 (file)
--- a/units/serial-getty@.service.in
+++ b/units/serial-getty@.service.in
@@ -27,7 +27,7 @@ Conflicts=rescue.service
 Before=rescue.service
 
 [Service]
-ExecStart=-{{AGETTY}} --noreset --noclear --issue-file=/etc/issue:/etc/issue.d:/run/issue.d:/usr/lib/issue.d --keep-baud 115200,57600,38400,9600 - ${TERM}
+ExecStart=-{{AGETTY}} --noreset --noclear --keep-baud 115200,57600,38400,9600 - ${TERM}
 Type=idle
 Restart=always
 UtmpIdentifier=%I