Add install-sysconfdir=no-samples option for (non-)installation of sample configs

By default, systemd installs various sample configuration files
containing commented-out defaults. Systems seeking to minimize the
number of files in /etc may wish to install directories and
configuration files that have semantic effects, but not install not
commented-out sample configuration files.

Turn install-sysconfdir into a multi-valued option, with a "no-samples"
value to skip installing sample-only configuration files.

diff --git a/meson.build b/meson.build
index 4a56ee3ee451243413d7113264f854d2eebca02f..a8afa0dd2f75af5b69a8bdf470a9655446d12fa2 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -126,7 +126,8 @@ if rootlibdir == ''
         rootlibdir = join_paths(rootprefixdir, libdir.split('/')[-1])
 endif
 
-install_sysconfdir = get_option('install-sysconfdir')
+install_sysconfdir = get_option('install-sysconfdir') != 'false'
+install_sysconfdir_samples = get_option('install-sysconfdir') == 'true'
 # Dirs of external packages
 pkgconfigdatadir = get_option('pkgconfigdatadir') == '' ? join_paths(datadir, 'pkgconfig') : get_option('pkgconfigdatadir')
 pkgconfiglibdir = get_option('pkgconfiglibdir') == '' ? join_paths(libdir, 'pkgconfig') : get_option('pkgconfiglibdir')
@@ -2968,7 +2969,7 @@ executable(
         install : true,
         install_dir : rootlibexecdir)
 
-if install_sysconfdir
+if install_sysconfdir_samples
         install_data('src/sleep/sleep.conf',
                      install_dir : pkgsysconfdir)
 endif

diff --git a/meson_options.txt b/meson_options.txt
index 2704f65baa051bf3b0466a6a761dc560814a579b..1707f64c177e1eab8616240d7b90ef185ac441bd 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -184,8 +184,8 @@ option('pamconfdir', type : 'string',
        description : 'directory for PAM configuration ["no" disables]')
 option('docdir', type : 'string',
        description : 'documentation directory')
-option('install-sysconfdir', type : 'boolean', value : true,
-       description : 'install configuration files to $sysconfdir')
+option('install-sysconfdir', type : 'combo', choices : ['true', 'no-samples', 'false'], value : 'true',
+       description : 'install configuration files and directories to $sysconfdir')
 
 option('fallback-hostname', type : 'string', value : 'localhost',
        description : 'the hostname used if none configured')

diff --git a/src/core/meson.build b/src/core/meson.build
index 662e6376f193f0834aac10727a4c732f3b902181..3482bd44721999cb140a04f097090cea52b2394d 100644 (file)
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -190,7 +190,7 @@ in_files = [['macros.systemd',   rpmmacrosdir],
 foreach item : in_files
         file = item[0]
         dir = item[1]
-        if install_sysconfdir or dir != pkgsysconfdir
+        if install_sysconfdir_samples or dir != pkgsysconfdir
                 configure_file(
                         input : file + '.in',
                         output : file,

diff --git a/src/coredump/meson.build b/src/coredump/meson.build
index ebd99bd379dfa08171cf1d4cacb986b7eeb413ca..2e445562459d2effb81b4f93018c12c46791d656 100644 (file)
--- a/src/coredump/meson.build
+++ b/src/coredump/meson.build
@@ -13,7 +13,7 @@ endif
 
 coredumpctl_sources = files('coredumpctl.c')
 
-if conf.get('ENABLE_COREDUMP') == 1 and install_sysconfdir
+if conf.get('ENABLE_COREDUMP') == 1 and install_sysconfdir_samples
         install_data('coredump.conf',
                      install_dir : pkgsysconfdir)
 endif

diff --git a/src/home/meson.build b/src/home/meson.build
index 8a879cc5d5d8bf79d2395dfeb8a34deed11faae2..61f1e08a8a07a1e19e499f36b3d3b2409cb73893 100644 (file)
--- a/src/home/meson.build
+++ b/src/home/meson.build
@@ -99,7 +99,7 @@ if conf.get('ENABLE_HOMED') == 1
         install_data('org.freedesktop.home1.policy',
                      install_dir : polkitpolicydir)
 
-        if install_sysconfdir
+        if install_sysconfdir_samples
                 install_data('homed.conf',
                              install_dir : pkgsysconfdir)
         endif

diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build
index 4572f4bd1c504cee76737954124559c3bd4e4dae..940cef30408c5597304d27543f89d839d5747809 100644 (file)
--- a/src/journal-remote/meson.build
+++ b/src/journal-remote/meson.build
@@ -59,7 +59,7 @@ if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1
                 input : 'journal-remote.conf.in',
                 output : 'journal-remote.conf',
                 configuration : substs)
-        if install_sysconfdir
+        if install_sysconfdir_samples
                 install_data(journal_remote_conf,
                              install_dir : pkgsysconfdir)
         endif

diff --git a/src/journal/meson.build b/src/journal/meson.build
index 7aea28d129c37172a401b2bf10ed999562a110ec..dd0982a158f81df788b91c41e5a9e3a8b2260dec 100644 (file)
--- a/src/journal/meson.build
+++ b/src/journal/meson.build
@@ -107,7 +107,7 @@ journalctl_sources = files('''
         pcre2-dlopen.h
 '''.split())
 
-if install_sysconfdir
+if install_sysconfdir_samples
         install_data('journald.conf',
                      install_dir : pkgsysconfdir)
 endif

diff --git a/src/login/meson.build b/src/login/meson.build
index e09610960bfd228aac03ede7ca7c0ca6ae31d727..9c7545790c619d9674259e2e93226b8865177ffd 100644 (file)
--- a/src/login/meson.build
+++ b/src/login/meson.build
@@ -74,7 +74,7 @@ if conf.get('ENABLE_LOGIND') == 1
                 input : 'logind.conf.in',
                 output : 'logind.conf',
                 configuration : substs)
-        if install_sysconfdir
+        if install_sysconfdir_samples
                 install_data(logind_conf,
                              install_dir : pkgsysconfdir)
         endif

diff --git a/src/network/meson.build b/src/network/meson.build
index 5cd76131680d5b6b6ed16feeab6a156017f204eb..72ca9b43e08127e0d0be2c8cda843e362c638b8e 100644 (file)
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -235,7 +235,7 @@ if conf.get('ENABLE_NETWORKD') == 1
                              install_dir : polkitpkladir)
         endif
 
-        if install_sysconfdir
+        if install_sysconfdir_samples
                 install_data('networkd.conf',
                              install_dir : pkgsysconfdir)
         endif

diff --git a/src/oom/meson.build b/src/oom/meson.build
index 1ea6766d1ad05296fd57349c741c9b0cf6b6eeba..a32c366237af3e5df683da8cc6d20e8b49e5a285 100644 (file)
--- a/src/oom/meson.build
+++ b/src/oom/meson.build
@@ -29,7 +29,7 @@ if conf.get('ENABLE_OOMD') == 1
         install_data('org.freedesktop.oom1.service',
                      install_dir : dbussystemservicedir)
 
-        if install_sysconfdir
+        if install_sysconfdir_samples
                 install_data('oomd.conf',
                              install_dir : pkgsysconfdir)
         endif

diff --git a/src/pstore/meson.build b/src/pstore/meson.build
index 6c0ab0563b5345dc1bbe813f2c8a41c8e3ca78c0..8e01af751c972b629e111a55c0e6194c3601f2a3 100644 (file)
--- a/src/pstore/meson.build
+++ b/src/pstore/meson.build
@@ -4,7 +4,7 @@ systemd_pstore_sources = files('''
         pstore.c
 '''.split())
 
-if conf.get('ENABLE_PSTORE') == 1 and install_sysconfdir
+if conf.get('ENABLE_PSTORE') == 1 and install_sysconfdir_samples
         install_data('pstore.conf',
                      install_dir : pkgsysconfdir)
 endif

diff --git a/src/resolve/meson.build b/src/resolve/meson.build
index 8e7bad06592fcefdd92b4640c282ed1d05271f38..d4cb5812a3cf92f48fcddaba6a501d1e1558afe1 100644 (file)
--- a/src/resolve/meson.build
+++ b/src/resolve/meson.build
@@ -169,7 +169,7 @@ if conf.get('ENABLE_RESOLVE') == 1
                 input : 'resolved.conf.in',
                 output : 'resolved.conf',
                 configuration : substs)
-        if install_sysconfdir
+        if install_sysconfdir_samples
                 install_data(resolved_conf,
                              install_dir : pkgsysconfdir)
         endif

diff --git a/src/timesync/meson.build b/src/timesync/meson.build
index 571e3fc7efc745d1fa0fee3a2ba4c015acb164e5..91e7cacfc5bd928c358c2afcb2c5d0979bfd7f0d 100644 (file)
--- a/src/timesync/meson.build
+++ b/src/timesync/meson.build
@@ -26,7 +26,7 @@ if conf.get('ENABLE_TIMESYNCD') == 1
                 input : 'timesyncd.conf.in',
                 output : 'timesyncd.conf',
                 configuration : substs)
-        if install_sysconfdir
+        if install_sysconfdir_samples
                 install_data(timesyncd_conf,
                              install_dir : pkgsysconfdir)
         endif

diff --git a/src/udev/meson.build b/src/udev/meson.build
index 5a1d2149d7600816171bf721e68c15ba4b376dd6..9ec14c80218e786b0a84c9ab3dab4a60f283a3cd 100644 (file)
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -203,7 +203,7 @@ foreach prog : udev_id_progs
         endif
 endforeach
 
-if install_sysconfdir
+if install_sysconfdir_samples
         install_data('udev.conf',
                      install_dir : join_paths(sysconfdir, 'udev'))
 endif