File util-linux-agetty-smart-reload-10.patch of Package util-linux.12158

Overview Repositories Revisions Requests Users Attributes Meta

File util-linux-agetty-smart-reload-10.patch of Package util-linux.12158

Refresh.
From d7a412fe0ae5fa08b891769be2961e5d80769484 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon, 12 Nov 2018 11:31:17 +0100
Subject: [PATCH 10/14] agetty: fix portability issues

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 term-utils/agetty.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Index: util-linux-2.29.2/term-utils/agetty.c
===================================================================
--- util-linux-2.29.2.orig/term-utils/agetty.c
+++ util-linux-2.29.2/term-utils/agetty.c
@@ -1715,6 +1715,7 @@ static int wait_for_term_input(int fd)
 }
 #endif  /* AGETTY_RELOAD */
 #ifdef	ISSUE
+#ifdef AGETTY_RELOAD
 static int issue_is_changed(struct issue *ie)
 {
 	if (ie->mem_old && ie->mem
@@ -1807,6 +1808,7 @@ static void eval_issue_file(struct issue
 	fclose(ie->output);
 #endif	/* ISSUE */
 }
+#endif
 
 /* Show login prompt, optionally preceded by /etc/issue contents. */
 static void do_prompt(struct issue *ie, struct options *op, struct termios *tp)
@@ -1955,8 +1957,8 @@ static char *get_logname(struct issue *i
 		/* Write issue file and prompt */
 		do_prompt(ie, op, tp);
 
-#ifdef AGETTY_RELOAD
 	no_reload:
+#ifdef AGETTY_RELOAD
 		/* If asked to reprompt *before* terminal input arrives, then do so */
 		if (!wait_for_term_input(STDIN_FILENO)) {
 			if (op->flags & F_VCONSOLE)
@@ -2581,6 +2583,7 @@ static void output_special_char(struct i
 			fprintf (ie->output, "%d ", users);
 		break;
 	}
+#if defined(RTMGRP_IPV4_IFADDR) && defined(RTMGRP_IPV6_IFADDR)
 	case '4':
 	case '6':
 	{
@@ -2600,6 +2603,7 @@ static void output_special_char(struct i
 		freeifaddrs(addrs);
 		break;
 	}
+#endif
 	default:
 		putchar(c);
 		break;

Places

File util-linux-agetty-smart-reload-10.patch of Package util-linux.12158

Places