diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-11-15 19:46:00 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-11-15 19:46:00 +0100 |
| commit | 1418ee7598ce0cc65d785b0889ca972bac09f9d0 (patch) | |
| tree | 583d9656eb9c88f73dad7c14eb29a90a0806a132 | |
| parent | 7ee598b450b5b4b8748cf99838ae83f85fec2b76 (diff) | |
| parent | c7eda0133b6bf13a182337cbe8a61bf2faf9b32e (diff) | |
Merge pull request #1901 from evverx/various-fixes
Various fixes
| -rw-r--r-- | src/firstboot/firstboot.c | 2 | ||||
| -rw-r--r-- | test/test-functions | 17 |
2 files changed, 12 insertions, 7 deletions
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; 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() { |