Hello community,
here is the log from the commit of package mingetty for openSUSE:11.4
checked in at Wed Mar 16 17:41:38 CET 2011.
--------
--- old-versions/11.4/all/mingetty/mingetty.changes 2011-01-12
13:11:11.000000000 +0100
+++ 11.4/mingetty/mingetty.changes 2011-03-15 13:26:37.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Mar 15 12:25:19 UTC 2011 - wer...@suse.de
+
+- Make hint handling on Num Lock et al smart (bnc#679287)
+
+-------------------------------------------------------------------
Package does not exist at destination yet. Using Fallback
old-versions/11.4/all/mingetty
Destination is old-versions/11.4/UPDATES/all/mingetty
calling whatdependson for 11.4-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mingetty.spec ++++++
--- /var/tmp/diff_new_pack.iCAe1n/_old 2011-03-16 17:40:36.000000000 +0100
+++ /var/tmp/diff_new_pack.iCAe1n/_new 2011-03-16 17:40:36.000000000 +0100
@@ -23,7 +23,7 @@
Group: System/Base
AutoReqProv: on
Version: 1.0.8s
-Release: 3
+Release: 6.<RELEASE2>
Summary: Minimal Getty for Virtual Consoles Only
Provides: sysvinit:/sbin/mingetty
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ mingetty-1.0.8s.dif ++++++
--- /var/tmp/diff_new_pack.iCAe1n/_old 2011-03-16 17:40:36.000000000 +0100
+++ /var/tmp/diff_new_pack.iCAe1n/_new 2011-03-16 17:40:36.000000000 +0100
@@ -10,8 +10,8 @@
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)
++++ mingetty.c 2011-03-14 12:56:51.479926014 +0000
+@@ -466,6 +466,45 @@ static void do_prompt (int showlogin)
puts ("[press ENTER to login]");
getc (stdin);
}
@@ -21,22 +21,43 @@
+ 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" : "");
++ char warn[128];
++ off_t len = 0;
++
++ if (nl && (kb & 0x02) == 0) {
++ strcpy(&warn[0], "Num Lock off");
++ len += 12;
++ } else if (nl == 0 && (kb & 2) && (kb & 0x20) == 0) {
++ strcpy(&warn[0], "Num Lock on");
++ len += 11;
++ }
++
++ if ((kb & 0x04) && (kb & 0x40) == 0) {
++ if (len) {
++ strcpy(&warn[len], ", ");
++ len += 2;
++ }
++ strcpy(&warn[len], "Caps Lock on");
++ len += 12;
++ }
++
++ if ((kb & 0x01) && (kb & 0x10) == 0) {
++ if (len) {
++ strcpy(&warn[len], ", ");
++ len += 2;
++ }
++ strcpy(&warn[len], "Scroll Lock on");
++ len += 14;
++ }
++
++ if (len)
++ printf ("Hint: %s\n\n", warn);
+ }
+ }
if (nohostname == 0)
printf ("%s ", hn);
if (showlogin)
-@@ -694,14 +712,8 @@ int main (int argc, char **argv)
+@@ -694,14 +733,8 @@ int main (int argc, char **argv)
logname = autologin;
logoptstr = "-f \\u";
} else {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
