diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-02-02 14:38:19 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-02-02 14:38:19 +0100 |
| commit | ea8b9b2f8ab960fb96157af2f4131511a853aa9a (patch) | |
| tree | ef1deebbc0e775450a5d2956193d190b7edb88ec | |
| parent | 7e215af765cf2cebbd8e9dd721ec57a1680950f6 (diff) | |
| download | systemd-ea8b9b2f8ab960fb96157af2f4131511a853aa9a.tar.gz | |
meson: take oomd out of the doghouse
It's on by default in Fedora 34 [1], so we can't say it's just a preview.
[1] https://fedoraproject.org/wiki/Changes/EnableSystemdOomd
| -rw-r--r-- | meson.build | 8 | ||||
| -rw-r--r-- | meson_options.txt | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/meson.build b/meson.build index 0af0cce8b8..e5d7c2710e 100644 --- a/meson.build +++ b/meson.build @@ -1450,14 +1450,6 @@ have = have and conf.get('HAVE_PAM') == 1 conf.set10('ENABLE_PAM_HOME', have) have = get_option('oomd') -if have == 'auto' - have = get_option('mode') == 'developer' -else - have = have == 'true' - if have and get_option('mode') != 'developer' - warning('oomd is not ready for release mode (yet)') - endif -endif conf.set10('ENABLE_OOMD', have) substs.set10('ENABLE_OOMD', have) diff --git a/meson_options.txt b/meson_options.txt index a421473029..425e958ba2 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -99,7 +99,7 @@ option('coredump', type : 'boolean', description : 'install the coredump handler') option('pstore', type : 'boolean', description : 'install the pstore archival tool') -option('oomd', type : 'combo', choices : ['auto', 'true', 'false'], +option('oomd', type : 'boolean', description : 'install the userspace oom killer') option('logind', type : 'boolean', description : 'install the systemd-logind stack') |