From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 24 Nov 2017 17:29:35 +0000 (+0100)
Subject: mkosi: let's switch to the unified mode for mkosi
X-Git-Tag: v236~113^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=deb3b156acd561d80d0f612e259cea4952d11e2b;p=thirdparty%2Fsystemd.git

mkosi: let's switch to the unified mode for mkosi

This is a toolconfiguration for developers, and hence most likely should
be the first thing to be switched over. Do so.
---

diff --git a/mkosi.build b/mkosi.build
index 71251920edc..7a72b63b94b 100755
--- a/mkosi.build
+++ b/mkosi.build
@@ -28,7 +28,7 @@ export LC_CTYPE=en_US.UTF-8
 
 sysvinit_path=`realpath /etc/init.d`
 
-[ -f "$BUILDDIR"/build.ninja ] || meson "$BUILDDIR" -D "sysvinit-path=$sysvinit_path"
+[ -f "$BUILDDIR"/build.ninja ] || meson "$BUILDDIR" -D "sysvinit-path=$sysvinit_path" -D "default-hierarchy=unified"
 ninja -C "$BUILDDIR" all
 [ "$WITH_TESTS" = 0 ] || ninja -C "$BUILDDIR" test || ( RET="$?" ; cat "$BUILDDIR"/meson-logs/testlog.txt ; exit "$RET" )
 ninja -C "$BUILDDIR" install