diff options
| author | Karel Zak | 2016-05-26 15:05:14 +0200 |
|---|---|---|
| committer | Karel Zak | 2016-05-26 15:08:53 +0200 |
| commit | 1eb16fd78065dd6485731c4fb70924bc9b69df3a (patch) | |
| tree | 76deb5ccf39a4e491bbc830860087af3c43f3076 /login-utils/sulogin.c | |
| parent | libblkid: store only canonical devnames to the cache (diff) | |
| download | kernel-qcow2-util-linux-1eb16fd78065dd6485731c4fb70924bc9b69df3a.tar.gz kernel-qcow2-util-linux-1eb16fd78065dd6485731c4fb70924bc9b69df3a.tar.xz kernel-qcow2-util-linux-1eb16fd78065dd6485731c4fb70924bc9b69df3a.zip | |
build-sys: add --disable-plymouth-support
The plymouth support depends on Linux specific SOCK_* flags and all
the feature is probably unnecessary in some cases (non-plymouth
distros, etc.)
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'login-utils/sulogin.c')
| -rw-r--r-- | login-utils/sulogin.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c index 8d6e65229..1f4e468f8 100644 --- a/login-utils/sulogin.c +++ b/login-utils/sulogin.c @@ -58,7 +58,9 @@ #include "closestream.h" #include "nls.h" #include "pathnames.h" -#include "plymouth-ctrl.h" +#ifdef USE_PLYMOUTH_SUPPORT +# include "plymouth-ctrl.h" +#endif #include "strutils.h" #include "ttyutils.h" #include "sulogin-consoles.h" @@ -100,9 +102,9 @@ static void tcinit(struct console *con) { int mode = 0, flags = 0; struct termios *tio = &con->tio; - struct termios lock; int fd = con->fd; -#ifdef TIOCGLCKTRMIOS +#ifdef USE_PLYMOUTH_SUPPORT + struct termios lock; int i = (plymouth_command(MAGIC_PING)) ? PLYMOUTH_TERMIOS_FLAGS_DELAY : 0; if (i) plymouth_command(MAGIC_QUIT); @@ -121,7 +123,6 @@ static void tcinit(struct console *con) memset(&lock, 0, sizeof(struct termios)); ioctl(fd, TIOCSLCKTRMIOS, &lock); #endif - errno = 0; if (tcgetattr(fd, tio) < 0) { |