[packages/kbd] - check return code of /usr/bin/tty rather than compare to non-localized text - release 3
hawk
hawk at pld-linux.org
Mon Feb 3 15:01:44 CET 2014
commit 7e53fad5274984c268ae6472f8017d40ce612952
Author: Marcin Krol <hawk at tld-linux.org>
Date: Mon Feb 3 14:01:05 2014 +0000
- check return code of /usr/bin/tty rather than compare to non-localized text
- release 3
kbd.init | 5 +++--
kbd.spec | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/kbd.spec b/kbd.spec
index 1196059..ad59ef6 100644
--- a/kbd.spec
+++ b/kbd.spec
@@ -12,7 +12,7 @@ Summary(ko.UTF-8): 콘솔을 설정하는 도구 (글쇠판, 가상 터미널,
Summary(pl.UTF-8): Narzędzia do obsługi konsoli
Name: kbd
Version: 2.0.1
-Release: 2
+Release: 3
License: GPL v2+
Group: Applications/Console
Source0: ftp://ftp.altlinux.org/pub/people/legion/kbd/%{name}-%{version}.tar.gz
diff --git a/kbd.init b/kbd.init
index 44ac83b..3ef30bb 100644
--- a/kbd.init
+++ b/kbd.init
@@ -48,9 +48,10 @@ start() {
fi
# save old tty number
tty=$(/usr/bin/tty)
- tty=${tty#$devpath}
- if [ "$tty" = "/dev/console" -o "$tty" = "not a tty" ]; then
+ if [ "$?" -ne 0 -o "$tty" = "/dev/console" ]; then
tty=1
+ else
+ tty=${tty#$devpath}
fi
if [ -n "$CONSOLEFONT" -a -x /sbin/setsysfont ]; then
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kbd.git/commitdiff/7e53fad5274984c268ae6472f8017d40ce612952
More information about the pld-cvs-commit
mailing list