File mingetty-1.0.8s.dif of Package mingetty

Overview Repositories Revisions Requests Users Attributes Meta

File mingetty-1.0.8s.dif of Package mingetty (Revision 2120fdb596aab308779a0a6d937b3830)

Currently displaying revision 2120fdb596aab308779a0a6d937b3830 , Show latest

--- Makefile
+++ Makefile	2010-07-23 12:29:12.038924788 +0000
@@ -5,7 +5,7 @@ DEFTERM	=	linux
 VERSION	=	mingetty-1.0.8s
 #
 DEFINES	=	-DRESET_TTY=1 -DDEFAULT_TERM=\"$(DEFTERM)\" -DVERSION=\"$(VERSION)\"
-CFLAGS	=	-Wall -O2 -pipe -D_GNU_SOURCE -D_BSD_SOURCE $(DEFINES)
+CFLAGS	=	-Wall $(RPM_OPT_FLAGS) -pipe -D_GNU_SOURCE -D_BSD_SOURCE $(DEFINES)
 #
 LDFLAGS	=	-Wl,-warn-common
 CC	=	gcc
--- mingetty.c
+++ mingetty.c	2011-01-12 12:07:53.912426018 +0000
@@ -466,6 +466,24 @@ static void do_prompt (int showlogin)
 		puts ("[press ENTER to login]");
 		getc (stdin);
 	}
+	if (showlogin) {
+		int kb = 0, nl = 0;
+		struct stat st;
+		if (stat("/var/run/numlock-on", &st) == 0)
+			nl = 1;
+		if (ioctl(0, KDGKBLED, &kb) == 0) {
+			if (nl && kb != 2)
+				printf ("Hint: %s%s%s\n\n",
+					kb&2 ? "" : kb&5 ? "Num Lock off, " : "Num Lock off ",
+					kb&1 ? kb&4 ? "Scroll Lock on, " : "Scroll Lock on " : "",
+					kb&4 ? "Caps Lock on" : "");
+			else if (nl == 0 && kb != 0)
+				printf ("Hint: %s%s%s\n\n",
+					kb&2 ? "Num Lock on" : kb&5 ? "Num Lock on, " : "",
+					kb&1 ? kb&4 ? "Scroll Lock on, " : "Scroll Lock on " : "",
+					kb&4 ? "Caps Lock on" : "");
+		}
+	}
 	if (nohostname == 0)
 		printf ("%s ", hn);
 	if (showlogin)
@@ -694,14 +712,8 @@ int main (int argc, char **argv)
 		logname = autologin;
 		logoptstr = "-f \\u";
 	} else {
-		int oldkb = 0;
-		if (ioctl(0, KDGKBLED, &oldkb) == 0)
-			(void)ioctl(0, KDSKBLED, (oldkb | 2) & ~4);
-
 		while ((logname = get_logname ()) == 0)
 			/* do nothing */ ;
-
-		(void)ioctl(0, KDSKBLED, &oldkb);
 	}
 
 	strncpy (logcmd, loginprog, NAME_MAX);

Places

File mingetty-1.0.8s.dif of Package mingetty (Revision 2120fdb596aab308779a0a6d937b3830)

Places