Merge pull request #12511 from ssahani/high-avilability-12050

[thirdparty/systemd.git] / meson_options.txt

diff --git a/meson_options.txt b/meson_options.txt
index 5d68970ff6b5c776d292b1743ac62a6e823a336b..494a8de43c487ec17f145ea0a6a411f549267473 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -31,8 +31,6 @@ option('telinit-path', type : 'string', value : '/lib/sysvinit/telinit',
        description : 'path to telinit')
 option('rc-local', type : 'string',
        value : '/etc/rc.local')
-option('halt-local', type : 'string',
-       value : '/usr/sbin/halt.local')
 
 option('quotaon-path', type : 'string', description : 'path to quotaon')
 option('quotacheck-path', type : 'string', description : 'path to quotacheck')
@@ -158,7 +156,7 @@ option('fallback-hostname', type : 'string', value : 'localhost',
 option('compat-gateway-hostname', type : 'boolean', value : 'false',
        description : 'allow "gateway" as the symbolic name for default gateway')
 option('default-hierarchy', type : 'combo',
-       choices : ['legacy', 'hybrid', 'unified'], value : 'hybrid',
+       choices : ['legacy', 'hybrid', 'unified'], value : 'unified',
        description : 'default cgroup hierarchy')
 option('default-net-naming-scheme', type : 'combo',
        choices : ['latest', 'v238', 'v239', 'v240'],