mirror of
https://git.yoctoproject.org/poky
synced 2026-02-25 02:49:40 +01:00
0f8c09193e
fix-configure.patch is removed as it's not appropriate, and the new version of util-linux has solved the problem this patch is trying to solve. util-linux-ensure-the-existence-of-directory-for-PAT.patch is removed as the new version of util-linux has solved the problem this patch is trying to solve. util-linux-native.patch is rebased. util-linux-ng-replace-siginterrupt.patch is rebased. Add PACKAGECONFIG for 'pylibmount' to build out python bindings for libmount optionally. util-linux-pylibmount is added to PACKAGES if PACKAGECONFIG has 'pylibmount' in it. Fix PACAGECONFIG for 'systemd' as the new version has changed things related to systemd. Now util-linux would have a dependency on systemd if 'systemd' is in PACKAGECONFIG. Fix SYSTEMD_PACKAGES, SYSTEMD_SERVICE and SYSTEMD_AUTO_ENABLE variable to match the new version. Four lines in do_compile task are deleted because they caused do_compile failure and nowhere in util-linux are they used. Corresponding files are also removed. (From OE-Core rev: 264e2fde3a8624c87d2451d2752c9f3ed8911672) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
34 lines
910 B
Diff
34 lines
910 B
Diff
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|
|
---
|
|
login-utils/login.c | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/login-utils/login.c b/login-utils/login.c
|
|
index ebb76f5..38c881b 100644
|
|
--- a/login-utils/login.c
|
|
+++ b/login-utils/login.c
|
|
@@ -1110,6 +1110,7 @@ int main(int argc, char **argv)
|
|
char *buff;
|
|
int childArgc = 0;
|
|
int retcode;
|
|
+ struct sigaction act;
|
|
|
|
char *pwdbuf = NULL;
|
|
struct passwd *pwd = NULL, _pwd;
|
|
@@ -1123,7 +1124,9 @@ int main(int argc, char **argv)
|
|
timeout = (unsigned int)getlogindefs_num("LOGIN_TIMEOUT", LOGIN_TIMEOUT);
|
|
|
|
signal(SIGALRM, timedout);
|
|
- siginterrupt(SIGALRM, 1); /* we have to interrupt syscalls like ioctl() */
|
|
+ (void) sigaction(SIGALRM, NULL, &act);
|
|
+ act.sa_flags &= ~SA_RESTART;
|
|
+ sigaction(SIGALRM, &act, NULL);
|
|
alarm(timeout);
|
|
signal(SIGQUIT, SIG_IGN);
|
|
signal(SIGINT, SIG_IGN);
|
|
--
|
|
1.9.1
|
|
|