From de3612dbd780c3acfff05e377fae1140c9434fe2 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Wed, 8 Nov 2023 18:39:48 +0000 Subject: [PATCH 1/2] core: fix build with -Dutmp=false --- src/core/exec-invoke.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c index 245e9b5a3d..38af3b488d 100644 --- a/src/core/exec-invoke.c +++ b/src/core/exec-invoke.c @@ -4369,6 +4369,7 @@ int exec_invoke( } } +#if ENABLE_UTMP if (context->utmp_id) { const char *line = context->tty_path ? (path_startswith(context->tty_path, "/dev/") ?: context->tty_path) : @@ -4380,6 +4381,7 @@ int exec_invoke( USER_PROCESS, username); } +#endif if (uid_is_valid(uid)) { r = chown_terminal(STDIN_FILENO, uid); From 37f16ef072e4ff1a91628678c1df1808505936cd Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Wed, 8 Nov 2023 18:41:09 +0000 Subject: [PATCH 2/2] ci: add -Dutmp=false coverage --- .github/workflows/build_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_test.sh b/.github/workflows/build_test.sh index 99dadd2228..c550046761 100755 --- a/.github/workflows/build_test.sh +++ b/.github/workflows/build_test.sh @@ -9,7 +9,7 @@ success() { echo >&2 -e "\033[32;1m$1\033[0m"; } ARGS=( "--optimization=0 -Dopenssl=disabled -Dcryptolib=gcrypt -Ddns-over-tls=gnutls -Dtpm=true -Dtpm2=enabled" - "--optimization=s" + "--optimization=s -Dutmp=false" "--optimization=3 -Db_lto=true -Ddns-over-tls=false" "--optimization=3 -Db_lto=false -Dtpm2=disabled -Dlibfido2=disabled -Dp11kit=disabled" "--optimization=3 -Ddns-over-tls=openssl"