[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH] Make LOADER_FLAGS_NOSHELL default also for s390x not just s390 (#527063)



This has always been broken for s390x since it was introduced in
67a5a0afb3100e7986ce127b3c2684e01c97304e. The fix ensures that both
s390 and s390x do not start a second shell on the console that collides
with init=linuxrc.s390 blocking on console input and potentially
providing a rescue shell after hitting return.
Apparently LOADER_FLAGS_NOUSB has gone meanwhile but nobody noticed
since this code path referencing it was never compiled on s390x.
---
 loader/loader.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/loader/loader.c b/loader/loader.c
index 69523cd..eefa520 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -1891,8 +1891,8 @@ int main(int argc, char ** argv) {
     flags |= LOADER_FLAGS_KICKSTART_SEND_MAC;
 
     /* JKFIXME: I do NOT like this... it also looks kind of bogus */
-#if defined(__s390__) && !defined(__s390x__)
-    flags |= LOADER_FLAGS_NOSHELL | LOADER_FLAGS_NOUSB;
+#if defined(__s390__) || defined(__s390x__)
+    flags |= LOADER_FLAGS_NOSHELL;
 #endif
 
     openLog(FL_TESTING(flags));
-- 
1.6.5



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]