-From 7deb6387aeb07fa4300fa3cf9d6c039dabd120d7 Mon Sep 17 00:00:00 2001
+From 69e440f9b7a0e9a43ef582d4bb521722b448a7c2 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Mon, 31 Jul 2017 10:08:46 -0400
Subject: [PATCH] fix-getty-unit
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
Prefer getty to agetty in console setup systemd units
Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
[aduskett@gmail.com: Update for systemd v237]
Signed-off-by: Adam Duskett <aduskett@gmail.com>
+[Jérémy: replace additional usage of agetty by getty.]
+Signed-off-by: Jérémy Rosen <jeremy.rosen@smile.fr>
---
- units/getty@.service.m4 | 5 +----
- units/serial-getty@.service.m4 | 2 +-
- 2 files changed, 2 insertions(+), 5 deletions(-)
+ units/console-getty.service.m4 | 2 +-
+ units/container-getty@.service.m4 | 2 +-
+ units/getty@.service.m4 | 5 +----
+ units/serial-getty@.service.m4 | 2 +-
+ 4 files changed, 4 insertions(+), 7 deletions(-)
+diff --git a/units/console-getty.service.m4 b/units/console-getty.service.m4
+index 3c553240a..fd5ad9456 100644
+--- a/units/console-getty.service.m4
++++ b/units/console-getty.service.m4
+@@ -23,7 +23,7 @@ ConditionPathExists=/dev/console
+ # The '-o' option value tells agetty to replace 'login' arguments with an
+ # option to preserve environment (-p), followed by '--' for safety, and then
+ # the entered username.
+-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud console 115200,38400,9600 $TERM
++ExecStart=-/sbin/getty -L %I 115200 vt100
+ Type=idle
+ Restart=always
+ UtmpIdentifier=cons
+diff --git a/units/container-getty@.service.m4 b/units/container-getty@.service.m4
+index 087ab7f9b..30f7b66fe 100644
+--- a/units/container-getty@.service.m4
++++ b/units/container-getty@.service.m4
+@@ -28,7 +28,7 @@ Before=rescue.service
+ # The '-o' option value tells agetty to replace 'login' arguments with an
+ # option to preserve environment (-p), followed by '--' for safety, and then
+ # the entered username.
+-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud pts/%I 115200,38400,9600 $TERM
++ExecStart=-/sbin/getty -L %I 115200 vt100
+ Type=idle
+ Restart=always
+ RestartSec=0
diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
-index 2a84061..7ad588f 100644
+index 80e793bb7..385758c61 100644
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -35,10 +35,7 @@ ConditionPathExists=/dev/tty0
Restart=always
RestartSec=0
diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4
-index b7caeaf..c663612 100644
+index 757b86ab2..3d60efdb6 100644
--- a/units/serial-getty@.service.m4
+++ b/units/serial-getty@.service.m4
@@ -33,7 +33,7 @@ Before=rescue.service
Restart=always
UtmpIdentifier=%I
--
-2.13.3
+2.14.4
+++ /dev/null
-From 227b8a762fea1458547be2cdf0e6e4aac0079730 Mon Sep 17 00:00:00 2001
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Mon, 26 Mar 2018 17:34:53 +0200
-Subject: [PATCH] core: don't include libmount.h in a header file (#8580)
-
-linux/fs.h sys/mount.h, libmount.h and missing.h all include MS_*
-definitions.
-
-To avoid problems, only one of linux/fs.h, sys/mount.h and libmount.h
-should be included. And missing.h must be included last.
-
-Without this, building systemd may fail with:
-
-In file included from [...]/libmount/libmount.h:31:0,
- from ../systemd-238/src/core/manager.h:23,
- from ../systemd-238/src/core/emergency-action.h:37,
- from ../systemd-238/src/core/unit.h:34,
- from ../systemd-238/src/core/dbus-timer.h:25,
- from ../systemd-238/src/core/timer.c:26:
-[...]/sys/mount.h:57:2: error: expected identifier before numeric constant
-
-Upstream: https://github.com/systemd/systemd/pull/8580
-Signed-off-by: Stefan Becker <chemobejk@gmail.com>
----
- src/core/dbus-execute.c | 1 +
- src/core/manager.h | 3 ++-
- src/core/mount.c | 2 ++
- 3 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
-index 7344623ebf6..c342093bca4 100644
---- a/src/core/dbus-execute.c
-+++ b/src/core/dbus-execute.c
-@@ -18,6 +18,7 @@
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
- ***/
-
-+#include <sys/mount.h>
- #include <sys/prctl.h>
- #include <stdio_ext.h>
-
-diff --git a/src/core/manager.h b/src/core/manager.h
-index 28c5da225b1..e09e0cdf5e9 100644
---- a/src/core/manager.h
-+++ b/src/core/manager.h
-@@ -20,7 +20,6 @@
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
- ***/
-
--#include <libmount.h>
- #include <stdbool.h>
- #include <stdio.h>
-
-@@ -34,6 +33,8 @@
- #include "list.h"
- #include "ratelimit.h"
-
-+struct libmnt_monitor;
-+
- /* Enforce upper limit how many names we allow */
- #define MANAGER_MAX_NAMES 131072 /* 128K */
-
-diff --git a/src/core/mount.c b/src/core/mount.c
-index 0e755da5c02..0154ebda5d6 100644
---- a/src/core/mount.c
-+++ b/src/core/mount.c
-@@ -23,6 +23,8 @@
- #include <stdio.h>
- #include <sys/epoll.h>
-
-+#include <libmount.h>
-+
- #include "sd-messages.h"
-
- #include "alloc-util.h"
+++ /dev/null
-From 848e863acc51ecfb0f3955c498874588201d9130 Mon Sep 17 00:00:00 2001
-From: Franck Bui <fbui@suse.com>
-Date: Thu, 15 Mar 2018 06:23:46 +0100
-Subject: [PATCH] basic/macros: rename noreturn into _noreturn_ (#8456)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-"noreturn" is reserved and can be used in other header files we include:
-
- [ 16s] In file included from /usr/include/gcrypt.h:30:0,
- [ 16s] from ../src/journal/journal-file.h:26,
- [ 16s] from ../src/journal/journal-vacuum.c:31:
- [ 16s] /usr/include/gpg-error.h:1544:46: error: expected ‘,’ or ‘;’ before ‘)’ token
- [ 16s] void gpgrt_log_bug (const char *fmt, ...) GPGRT_ATTR_NR_PRINTF(1,2);
-
-Here we include grcrypt.h (which in turns include gpg-error.h) *after* we
-"noreturn" was defined in macro.h.
-
-Upstream: https://github.com/systemd/systemd/pull/8456
-Signed-off-by: Stefan Becker <chemobejk@gmail.com>
----
- src/basic/log.c | 4 ++--
- src/basic/log.h | 4 ++--
- src/basic/macro.h | 19 +++++++++----------
- src/basic/process-util.c | 2 +-
- src/basic/process-util.h | 2 +-
- src/core/main.c | 4 ++--
- src/journal/test-journal-interleaving.c | 2 +-
- src/shared/pager.c | 2 +-
- src/udev/collect/collect.c | 2 +-
- 9 files changed, 20 insertions(+), 21 deletions(-)
-
-diff --git a/src/basic/log.c b/src/basic/log.c
-index 7a7f2cbec13..16a2431c548 100644
---- a/src/basic/log.c
-+++ b/src/basic/log.c
-@@ -814,7 +814,7 @@ static void log_assert(
- log_dispatch_internal(level, 0, file, line, func, NULL, NULL, NULL, NULL, buffer);
- }
-
--noreturn void log_assert_failed_realm(
-+_noreturn_ void log_assert_failed_realm(
- LogRealm realm,
- const char *text,
- const char *file,
-@@ -826,7 +826,7 @@ noreturn void log_assert_failed_realm(
- abort();
- }
-
--noreturn void log_assert_failed_unreachable_realm(
-+_noreturn_ void log_assert_failed_unreachable_realm(
- LogRealm realm,
- const char *text,
- const char *file,
-diff --git a/src/basic/log.h b/src/basic/log.h
-index efcf0f1bfc1..314be128a23 100644
---- a/src/basic/log.h
-+++ b/src/basic/log.h
-@@ -186,7 +186,7 @@ int log_dump_internal(
- char *buffer);
-
- /* Logging for various assertions */
--noreturn void log_assert_failed_realm(
-+_noreturn_ void log_assert_failed_realm(
- LogRealm realm,
- const char *text,
- const char *file,
-@@ -195,7 +195,7 @@ noreturn void log_assert_failed_realm(
- #define log_assert_failed(text, ...) \
- log_assert_failed_realm(LOG_REALM, (text), __VA_ARGS__)
-
--noreturn void log_assert_failed_unreachable_realm(
-+_noreturn_ void log_assert_failed_unreachable_realm(
- LogRealm realm,
- const char *text,
- const char *file,
-diff --git a/src/basic/macro.h b/src/basic/macro.h
-index 95be63a2040..8911edfc4be 100644
---- a/src/basic/macro.h
-+++ b/src/basic/macro.h
-@@ -53,6 +53,15 @@
- #else
- #define _fallthrough_
- #endif
-+/* Define C11 noreturn without <stdnoreturn.h> and even on older gcc
-+ * compiler versions */
-+#ifndef _noreturn_
-+#if __STDC_VERSION__ >= 201112L
-+#define _noreturn_ _Noreturn
-+#else
-+#define _noreturn_ __attribute__((noreturn))
-+#endif
-+#endif
-
- /* Temporarily disable some warnings */
- #define DISABLE_WARNING_DECLARATION_AFTER_STATEMENT \
-@@ -414,16 +423,6 @@ static inline unsigned long ALIGN_POWER2(unsigned long u) {
- #endif
- #endif
-
--/* Define C11 noreturn without <stdnoreturn.h> and even on older gcc
-- * compiler versions */
--#ifndef noreturn
--#if __STDC_VERSION__ >= 201112L
--#define noreturn _Noreturn
--#else
--#define noreturn __attribute__((noreturn))
--#endif
--#endif
--
- #define DEFINE_TRIVIAL_CLEANUP_FUNC(type, func) \
- static inline void func##p(type *p) { \
- if (*p) \
-diff --git a/src/basic/process-util.c b/src/basic/process-util.c
-index aa9846db5dc..e6120af5b68 100644
---- a/src/basic/process-util.c
-+++ b/src/basic/process-util.c
-@@ -987,7 +987,7 @@ bool is_main_thread(void) {
- return cached > 0;
- }
-
--noreturn void freeze(void) {
-+_noreturn_ void freeze(void) {
-
- log_close();
-
-diff --git a/src/basic/process-util.h b/src/basic/process-util.h
-index 93029e36e5f..5170adec7bb 100644
---- a/src/basic/process-util.h
-+++ b/src/basic/process-util.h
-@@ -91,7 +91,7 @@ int pid_from_same_root_fs(pid_t pid);
-
- bool is_main_thread(void);
-
--noreturn void freeze(void);
-+_noreturn_ void freeze(void);
-
- bool oom_score_adjust_is_valid(int oa);
-
-diff --git a/src/core/main.c b/src/core/main.c
-index 076846a41c0..4b2d1492373 100644
---- a/src/core/main.c
-+++ b/src/core/main.c
-@@ -141,7 +141,7 @@ static uint64_t arg_default_tasks_max = UINT64_MAX;
- static sd_id128_t arg_machine_id = {};
- static EmergencyAction arg_cad_burst_action = EMERGENCY_ACTION_REBOOT_FORCE;
-
--noreturn static void freeze_or_reboot(void) {
-+_noreturn_ static void freeze_or_reboot(void) {
-
- if (arg_crash_reboot) {
- log_notice("Rebooting in 10s...");
-@@ -156,7 +156,7 @@ noreturn static void freeze_or_reboot(void) {
- freeze();
- }
-
--noreturn static void crash(int sig) {
-+_noreturn_ static void crash(int sig) {
- struct sigaction sa;
- pid_t pid;
-
-diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c
-index 5a88b2774fa..d87bdbdd32a 100644
---- a/src/journal/test-journal-interleaving.c
-+++ b/src/journal/test-journal-interleaving.c
-@@ -37,7 +37,7 @@
-
- static bool arg_keep = false;
-
--noreturn static void log_assert_errno(const char *text, int error, const char *file, int line, const char *func) {
-+_noreturn_ static void log_assert_errno(const char *text, int error, const char *file, int line, const char *func) {
- log_internal(LOG_CRIT, error, file, line, func,
- "'%s' failed at %s:%u (%s): %m", text, file, line, func);
- abort();
-diff --git a/src/shared/pager.c b/src/shared/pager.c
-index 75db3c985bd..681af9c40e3 100644
---- a/src/shared/pager.c
-+++ b/src/shared/pager.c
-@@ -47,7 +47,7 @@ static int stored_stderr = -1;
- static bool stdout_redirected = false;
- static bool stderr_redirected = false;
-
--noreturn static void pager_fallback(void) {
-+_noreturn_ static void pager_fallback(void) {
- int r;
-
- r = copy_bytes(STDIN_FILENO, STDOUT_FILENO, (uint64_t) -1, 0);
-diff --git a/src/udev/collect/collect.c b/src/udev/collect/collect.c
-index 2821640e93b..c8fa47b3d7d 100644
---- a/src/udev/collect/collect.c
-+++ b/src/udev/collect/collect.c
-@@ -58,7 +58,7 @@ static inline struct _mate *node_to_mate(struct udev_list_node *node)
- return container_of(node, struct _mate, node);
- }
-
--noreturn static void sig_alrm(int signo)
-+_noreturn_ static void sig_alrm(int signo)
- {
- exit(4);
- }
projects / buildroot.git / commitdiff