Install default configuration into $out/share/factory

Mic92 · andir · commit 9a30393449a3 · 2018-10-29T14:24:58.000+01:00
By default systemd should read all its configuration from /etc. Therefor
we rely on -Dsysconfdir=/etc in meson as default value. Unfortunately
this would also lead to installation of systemd's own configuration
files to `/etc` whereas we are limited to /nix/store. To counter that
this commit introduces two new configuration variables `factoryconfdir`
and `factorypkgconfdir` to install systemd's own configuration into nix
store again, while having executables looking up files in /etc.
diff --git a/hwdb/meson.build b/hwdb/meson.build
@@ -26,7 +26,7 @@ if conf.get('ENABLE_HWDB') == 1
                      install_dir : udevhwdbdir)
 
         meson.add_install_script('sh', '-c',
-                                 mkdir_p.format(join_paths(sysconfdir, 'udev/hwdb.d')))
+                                 mkdir_p.format(join_paths(factoryconfdir, 'udev/hwdb.d')))
 endif
 
 ############################################################
diff --git a/meson.build b/meson.build
@@ -131,6 +131,9 @@ udevhwdbdir = join_paths(udevlibexecdir, 'hwdb.d')
 catalogdir = join_paths(prefixdir, 'lib/systemd/catalog')
 kernelinstalldir = join_paths(prefixdir, 'lib/kernel/install.d')
 factorydir = join_paths(datadir, 'factory')
+factoryconfdir = join_paths(datadir, 'factory/etc')
+factorypkgconfdir = join_paths(datadir, 'factory/etc/systemd')
+factoryxinitrcdir = join_paths(datadir, 'factory/etc/X11/xinit/xinitrc.d')
 bootlibdir = join_paths(prefixdir, 'lib/systemd/boot/efi')
 testsdir = join_paths(prefixdir, 'lib/systemd/tests')
 systemdstatedir = join_paths(localstatedir, 'lib/systemd')
@@ -2125,7 +2128,7 @@ if conf.get('ENABLE_BINFMT') == 1
         meson.add_install_script('sh', '-c',
                                  mkdir_p.format(binfmtdir))
         meson.add_install_script('sh', '-c',
-                                 mkdir_p.format(join_paths(sysconfdir, 'binfmt.d')))
+                                 mkdir_p.format(join_paths(factoryconfdir, 'binfmt.d')))
 endif
 
 if conf.get('ENABLE_VCONSOLE') == 1
@@ -2507,7 +2510,7 @@ if conf.get('HAVE_KMOD') == 1
         meson.add_install_script('sh', '-c',
                                  mkdir_p.format(modulesloaddir))
         meson.add_install_script('sh', '-c',
-                                 mkdir_p.format(join_paths(sysconfdir, 'modules-load.d')))
+                                 mkdir_p.format(join_paths(factoryconfdir, 'modules-load.d')))
 endif
 
 exe = executable('systemd-nspawn',
@@ -2713,7 +2716,7 @@ install_subdir('factory/etc',
                install_dir : factorydir)
 
 install_data('xorg/50-systemd-user.sh',
-             install_dir : xinitrcdir)
+             install_dir : factoryxinitrcdir)
 install_data('modprobe.d/systemd.conf',
              install_dir : modprobedir)
 install_data('LICENSE.GPL2',
diff --git a/network/meson.build b/network/meson.build
@@ -7,7 +7,7 @@ if conf.get('ENABLE_NETWORKD') == 1
                      install_dir : networkdir)
 
         meson.add_install_script('sh', '-c',
-                                 mkdir_p.format(join_paths(sysconfdir, 'systemd/network')))
+                                 mkdir_p.format(join_paths(factoryconfdir, 'systemd/network')))
 endif
 
 install_data('99-default.link',
diff --git a/src/core/meson.build b/src/core/meson.build
@@ -173,7 +173,7 @@ systemd_shutdown_sources = files('''
 in_files = [['macros.systemd',   rpmmacrosdir],
             ['triggers.systemd', ''],
             ['systemd.pc',       pkgconfigdatadir],
-            ['system.conf',      pkgsysconfdir]]
+            ['system.conf',      factorypkgconfdir]]
 
 foreach item : in_files
         file = item[0]
@@ -206,18 +206,18 @@ install_data(policy,
              install_dir : polkitpolicydir)
 
 install_data('user.conf',
-             install_dir : pkgsysconfdir)
+             install_dir : factorypkgconfdir)
 
 meson.add_install_script('sh', '-c', mkdir_p.format(systemshutdowndir))
 meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir))
 meson.add_install_script('sh', '-c', mkdir_p.format(systemgeneratordir))
 meson.add_install_script('sh', '-c', mkdir_p.format(usergeneratordir))
 
 meson.add_install_script('sh', '-c',
-                         mkdir_p.format(join_paths(pkgsysconfdir, 'system/multi-user.target.wants')))
+                         mkdir_p.format(join_paths(factorypkgconfdir, 'system/multi-user.target.wants')))
 meson.add_install_script('sh', '-c',
-                         mkdir_p.format(join_paths(pkgsysconfdir, 'system/getty.target.wants')))
+                         mkdir_p.format(join_paths(factorypkgconfdir, 'system/getty.target.wants')))
 meson.add_install_script('sh', '-c',
-                         mkdir_p.format(join_paths(pkgsysconfdir, 'user')))
+                         mkdir_p.format(join_paths(factorypkgconfdir, 'user')))
 meson.add_install_script('sh', '-c',
-                         mkdir_p.format(join_paths(sysconfdir, 'xdg/systemd')))
+                         mkdir_p.format(join_paths(factoryconfdir, 'xdg/systemd')))
diff --git a/src/coredump/meson.build b/src/coredump/meson.build
@@ -14,7 +14,7 @@ endif
 coredumpctl_sources = files('coredumpctl.c')
 
 install_data('coredump.conf',
-             install_dir : pkgsysconfdir)
+             install_dir : factorypkgconfdir)
 
 tests += [
         [['src/coredump/test-coredump-vacuum.c',
diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build
@@ -49,7 +49,7 @@ if conf.get('ENABLE_REMOTE') ==1 and conf.get('HAVE_LIBCURL') == 1
                 output : 'journal-upload.conf',
                 configuration : substs)
         install_data(journal_upload_conf,
-                     install_dir : pkgsysconfdir)
+                     install_dir : factorypkgconfdir)
 endif
 
 if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1
@@ -58,7 +58,7 @@ if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1
                 output : 'journal-remote.conf',
                 configuration : substs)
         install_data(journal_remote_conf,
-                     install_dir : pkgsysconfdir)
+                     install_dir : factorypkgconfdir)
 
         install_data('browse.html',
                      install_dir : join_paths(pkgdatadir, 'gatewayd'))
diff --git a/src/journal/meson.build b/src/journal/meson.build
@@ -109,4 +109,4 @@ if conf.get('HAVE_QRENCODE') == 1
 endif
 
 install_data('journald.conf',
-             install_dir : pkgsysconfdir)
+             install_dir : factorypkgconfdir)
diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build
@@ -10,4 +10,4 @@ install_data('50-depmod.install',
              install_dir : kernelinstalldir)
 
 meson.add_install_script('sh', '-c',
-                         mkdir_p.format(join_paths(sysconfdir, 'kernel/install.d')))
+                         mkdir_p.format(join_paths(factoryconfdir, 'kernel/install.d')))
diff --git a/src/login/meson.build b/src/login/meson.build
@@ -66,7 +66,7 @@ if conf.get('ENABLE_LOGIND') == 1
                 output : 'logind.conf',
                 configuration : substs)
         install_data(logind_conf,
-                     install_dir : pkgsysconfdir)
+                     install_dir : factorypkgconfdir)
 
         pam_systemd_sym = 'src/login/pam_systemd.sym'
         pam_systemd_c = files('pam_systemd.c')
diff --git a/src/resolve/meson.build b/src/resolve/meson.build
@@ -157,7 +157,7 @@ if conf.get('ENABLE_RESOLVE') == 1
                 output : 'resolved.conf',
                 configuration : substs)
         install_data(resolved_conf,
-                     install_dir : pkgsysconfdir)
+                     install_dir : factorypkgconfdir)
 
         install_data('resolv.conf',
                      install_dir : rootlibexecdir)
diff --git a/src/timesync/meson.build b/src/timesync/meson.build
@@ -27,7 +27,7 @@ if conf.get('ENABLE_TIMESYNCD') == 1
                 output : 'timesyncd.conf',
                 configuration : substs)
         install_data(timesyncd_conf,
-                     install_dir : pkgsysconfdir)
+                     install_dir : factorypkgconfdir)
         install_data('org.freedesktop.timesync1.conf',
                      install_dir : dbuspolicydir)
         install_data('org.freedesktop.timesync1.service',
diff --git a/src/udev/meson.build b/src/udev/meson.build
@@ -181,7 +181,7 @@ foreach prog : [['ata_id/ata_id.c'],
 endforeach
 
 install_data('udev.conf',
-             install_dir : join_paths(sysconfdir, 'udev'))
+             install_dir : join_paths(factoryconfdir, 'udev'))
 
 udev_pc = configure_file(
         input : 'udev.pc.in',
@@ -191,4 +191,4 @@ install_data(udev_pc,
              install_dir : pkgconfigdatadir)
 
 meson.add_install_script('sh', '-c',
-                         mkdir_p.format(join_paths(sysconfdir, 'udev/rules.d')))
+                         mkdir_p.format(join_paths(factoryconfdir, 'udev/rules.d')))
diff --git a/sysctl.d/meson.build b/sysctl.d/meson.build
@@ -20,4 +20,4 @@ foreach file : in_files
 endforeach
 
 meson.add_install_script('sh', '-c',
-                         mkdir_p.format(join_paths(sysconfdir, 'sysctl.d')))
+                         mkdir_p.format(join_paths(factoryconfdir, 'sysctl.d')))
diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build
@@ -49,5 +49,5 @@ endforeach
 if enable_tmpfiles
         meson.add_install_script(
                 'sh', '-c',
-                mkdir_p.format(join_paths(sysconfdir, 'tmpfiles.d')))
+                mkdir_p.format(join_paths(factoryconfdir, 'tmpfiles.d')))
 endif
diff --git a/units/meson.build b/units/meson.build
@@ -34,7 +34,7 @@ units = [
         ['local-fs.target',                     ''],
         ['machine.slice',                       'ENABLE_MACHINED'],
         ['machines.target',                     'ENABLE_MACHINED',
-         join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')],
+         join_paths(factorypkgconfdir, 'system/multi-user.target.wants/')],
         ['multi-user.target',                   '',
          'runlevel2.target runlevel3.target runlevel4.target'],
         ['network-online.target',               ''],
@@ -52,10 +52,10 @@ units = [
         ['reboot.target',                       '',
          'runlevel6.target ctrl-alt-del.target'],
         ['remote-cryptsetup.target',            'HAVE_LIBCRYPTSETUP',
-         join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')],
+         join_paths(factorypkgconfdir, 'system/multi-user.target.wants/')],
         ['remote-fs-pre.target',                ''],
         ['remote-fs.target',                    '',
-         join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')],
+         join_paths(factorypkgconfdir, 'system/multi-user.target.wants/')],
         ['rescue.target',                       '',
          'runlevel1.target'],
         ['rpcbind.target',                      ''],
@@ -96,7 +96,7 @@ units = [
         ['systemd-journald.socket',             '',
          'sockets.target.wants/'],
         ['systemd-networkd.socket',             'ENABLE_NETWORKD',
-         join_paths(pkgsysconfdir, 'system/sockets.target.wants/')],
+         join_paths(factorypkgconfdir, 'system/sockets.target.wants/')],
         ['systemd-rfkill.socket',               'ENABLE_RFKILL'],
         ['systemd-tmpfiles-clean.timer',        '',
          'timers.target.wants/'],
@@ -171,10 +171,10 @@ in_units = [
         ['systemd-modules-load.service',         'HAVE_KMOD',
          'sysinit.target.wants/'],
         ['systemd-networkd.service',             'ENABLE_NETWORKD',
-         join_paths(pkgsysconfdir, 'system/dbus-org.freedesktop.network1.service') + ' ' +
-         join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')],
+         join_paths(factorypkgconfdir, 'system/dbus-org.freedesktop.network1.service') + ' ' +
+         join_paths(factorypkgconfdir, 'system/multi-user.target.wants/')],
         ['systemd-networkd-wait-online.service', 'ENABLE_NETWORKD',
-         join_paths(pkgsysconfdir, 'system/network-online.target.wants/')],
+         join_paths(factorypkgconfdir, 'system/network-online.target.wants/')],
         ['systemd-nspawn@.service',              ''],
         ['systemd-portabled.service',            'ENABLE_PORTABLED',
          'dbus-org.freedesktop.portable1.service'],
@@ -186,8 +186,8 @@ in_units = [
         ['systemd-remount-fs.service',           '',
          'local-fs.target.wants/'],
         ['systemd-resolved.service',             'ENABLE_RESOLVE',
-         join_paths(pkgsysconfdir, 'system/dbus-org.freedesktop.resolve1.service') + ' ' +
-         join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')],
+         join_paths(factorypkgconfdir, 'system/dbus-org.freedesktop.resolve1.service') + ' ' +
+         join_paths(factorypkgconfdir, 'system/multi-user.target.wants/')],
         ['systemd-rfkill.service',               'ENABLE_RFKILL'],
         ['systemd-suspend.service',              ''],
         ['systemd-sysctl.service',               '',
@@ -197,7 +197,7 @@ in_units = [
         ['systemd-timedated.service',            'ENABLE_TIMEDATED',
          'dbus-org.freedesktop.timedate1.service'],
         ['systemd-timesyncd.service',            'ENABLE_TIMESYNCD',
-         join_paths(pkgsysconfdir, 'system/sysinit.target.wants/')],
+         join_paths(factorypkgconfdir, 'system/sysinit.target.wants/')],
         ['systemd-time-wait-sync.service',       'ENABLE_TIMESYNCD'],
         ['systemd-tmpfiles-clean.service',       'ENABLE_TMPFILES'],
         ['systemd-tmpfiles-setup-dev.service',   'ENABLE_TMPFILES',
@@ -228,7 +228,7 @@ m4_units = [
         ['container-getty@.service',           ''],
         ['getty@.service',                     '',
          'autovt@.service ' +
-         join_paths(pkgsysconfdir, 'system/getty.target.wants/getty@tty1.service')],
+         join_paths(factorypkgconfdir, 'system/getty.target.wants/getty@tty1.service')],
         ['serial-getty@.service',              ''],
 ]
 
@@ -313,7 +313,7 @@ install_data('user-.slice.d/10-defaults.conf',
 
 meson.add_install_script(meson_make_symlink,
                          join_paths(pkgsysconfdir, 'user'),
-                         join_paths(sysconfdir, 'xdg/systemd/user'))
+                         join_paths(factorypkgconfdir, 'xdg/systemd/user'))
 meson.add_install_script(meson_make_symlink,
                          join_paths(dbussystemservicedir, 'org.freedesktop.systemd1.service'),
                          join_paths(dbussessionservicedir, 'org.freedesktop.systemd1.service'))
