Merge pull request #18182 from DaanDeMeyer/mkosi-build-pushd

mkosi.build: Silence "Entering directory" message from ninja

1 files changed, 5 insertions, 3 deletions

diff --git a/mkosi.build b/mkosi.build
index 5da5207fb5..ede394f4fd 100755
--- a/mkosi.build
+++ b/mkosi.build
@@ -87,14 +87,16 @@ if [ ! -f "$BUILDDIR"/build.ninja ] ; then
         meson "$BUILDDIR" -D "sysvinit-path=$sysvinit_path" -D "rootprefix=$rootprefix" -D man=false -D "nobody-user=$nobody_user" -D "nobody-group=$nobody_group"
 fi
 
-ninja -C "$BUILDDIR" all
+cd "$BUILDDIR"
+ninja
 if [ "$WITH_TESTS" = 1 ] ; then
         for id in 1 2 3; do
-                groupadd -g $id testgroup$id || :
+                getent group $id > /dev/null || groupadd -g $id testgroup$id
         done
 
-        ninja -C "$BUILDDIR" test
+        ninja test
 fi
+cd "$SRCDIR"
 
 # Ubuntu Focal is stuck with meson 0.53.0.
 if [ "$(meson -v | cut -d . -f 2)" -gt 53 ] ; then