diff options
| author | Karel Zak | 2014-11-21 11:38:11 +0100 |
|---|---|---|
| committer | Karel Zak | 2014-11-21 11:38:11 +0100 |
| commit | 90d5285d8c21897d3fc0caed4691c88f15d0131b (patch) | |
| tree | 9640b41b414009e4d4b1cdf842536d74ef219158 | |
| parent | libfdisk: add ref.counting to ask API (diff) | |
| download | kernel-qcow2-util-linux-90d5285d8c21897d3fc0caed4691c88f15d0131b.tar.gz kernel-qcow2-util-linux-90d5285d8c21897d3fc0caed4691c88f15d0131b.tar.xz kernel-qcow2-util-linux-90d5285d8c21897d3fc0caed4691c88f15d0131b.zip | |
agetty: use futimens, check for all in configure.ac
It seems better to warn about --reload in ./configure if futimens or
inotify_init1 are missing.
The patch also replaces futimes() with futimens() to make the code
compatible with Uclibc.
Addresses: https://github.com/karelzak/util-linux/issues/133
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | term-utils/agetty.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 5ec307236..6c504b8e1 100644 --- a/configure.ac +++ b/configure.ac @@ -313,7 +313,6 @@ AC_CHECK_FUNCS([ \ getrlimit \ getsgnam \ inotify_init \ - inotify_init1 \ jrand48 \ lchown \ llseek \ @@ -346,6 +345,8 @@ AC_FUNC_FSEEKO AC_CHECK_FUNCS([openat fstatat unlinkat], [have_openat=yes], [have_openat=no]) AC_CHECK_FUNCS([ioperm iopl], [have_io=yes]) +AC_CHECK_FUNCS([futimens], [have_futimens=yes]) +AC_CHECK_FUNCS([inotify_init1], [have_inotify_init1=yes]) dnl Old glibc requires -lrt AC_CHECK_FUNCS(clock_gettime, [], [ @@ -1052,6 +1053,11 @@ AC_ARG_ENABLE([agetty], ) UL_BUILD_INIT([agetty]) AM_CONDITIONAL([BUILD_AGETTY], [test "x$build_agetty" = xyes]) +AS_IF([test "x$have_futimens" = xyes -a "x$have_inotify_init1" = xyes ], [ + AC_DEFINE([AGETTY_RELOAD], [1], [Enable agetty --reload feature]) +],[ + AC_MSG_WARN([futimens or inotify_init1 not found; agetty(8) will not provide ---reload functionality]) +]) AC_ARG_ENABLE([cramfs], diff --git a/term-utils/agetty.c b/term-utils/agetty.c index f7ae570fb..9871a3685 100644 --- a/term-utils/agetty.c +++ b/term-utils/agetty.c @@ -126,12 +126,6 @@ /* * agetty --reload */ -#define AGETTY_RELOAD /* enabled by default */ - -#ifndef HAVE_INOTIFY_INIT1 -# undef AGETTY_RELOAD /* disable on systems without inotify */ -#endif - #ifdef AGETTY_RELOAD # include <sys/inotify.h> # define AGETTY_RELOAD_FILENAME "/run/agetty.reload" /* trigger file */ @@ -2499,7 +2493,7 @@ static void reload_agettys(void) if (fd < 0) err(EXIT_FAILURE, _("cannot open: %s"), AGETTY_RELOAD_FILENAME); - if (futimes(fd, NULL) < 0 || close(fd) < 0) + if (futimens(fd, NULL) < 0 || close(fd) < 0) err(EXIT_FAILURE, _("cannot touch file: %s"), AGETTY_RELOAD_FILENAME); #else |