From db260eedc27814248da39ebdfc84a3f5584b0b16 Mon Sep 17 00:00:00 2001 From: Evgeny Vereshchagin Date: Sun, 15 Nov 2015 16:16:38 +0000 Subject: firstboot: log on take_etc_passwd_lock error too --- src/firstboot/firstboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c index 642d36912c..469ee7af68 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c @@ -542,7 +542,7 @@ static int process_root_password(void) { lock = take_etc_passwd_lock(arg_root); if (lock < 0) - return lock; + return log_error_errno(lock, "Failed to take a lock: %m"); if (arg_copy_root_password && arg_root) { struct spwd *p; -- cgit v1.2.3-54-g00ecf From c7eda0133b6bf13a182337cbe8a61bf2faf9b32e Mon Sep 17 00:00:00 2001 From: Evgeny Vereshchagin Date: Sun, 15 Nov 2015 17:26:05 +0000 Subject: tests: install execs from user units too Fixes: systemd[39]: systemd-exit.service: Executing: /bin/kill -s 58 29 systemd[39]: systemd-exit.service: Failed at step EXEC spawning /bin/kill: No such file or directory systemd[29]: Received SIGCHLD from PID 39 ((kill)). systemd[29]: Child 39 ((kill)) died (code=exited, status=203/EXEC) --- test/test-functions | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/test/test-functions b/test/test-functions index 2f5ec9b93f..49f143ec1e 100644 --- a/test/test-functions +++ b/test/test-functions @@ -179,12 +179,17 @@ EOF } install_execs() { - # install any Execs from the service files - egrep -ho '^Exec[^ ]*=[^ ]+' $initdir/lib/systemd/system/*.service \ - | while read i; do - i=${i##Exec*=}; i=${i##-} - inst $i - done + ddebug "install any Execs from the service files" + ( + export PKG_CONFIG_PATH=$TEST_BASE_DIR/../src/core/ + systemdsystemunitdir=$(pkg-config --variable=systemdsystemunitdir systemd) + systemduserunitdir=$(pkg-config --variable=systemduserunitdir systemd) + egrep -ho '^Exec[^ ]*=[^ ]+' $initdir/{$systemdsystemunitdir,$systemduserunitdir}/*.service \ + | while read i; do + i=${i##Exec*=}; i=${i##-} + inst $i + done + ) } generate_module_dependencies() { -- cgit v1.2.3-54-g00ecf