@ -1,7 +1,7 @@
From a087cb535b2d3c7a5d989b5aabc0a257369e9f9d Mon Sep 17 00:00:00 2001
From be87849145bc50ab0b16c63fe2b748de13974f0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 26 Feb 2018 14:25:57 +0000
Subject: [PATCH 18/27 ] Install default configuration into $out/share/factory
Subject: [PATCH 12/18 ] Install default configuration into $out/share/factory
By default systemd should read all its configuration from /etc. Therefor
we rely on -Dsysconfdir=/etc in meson as default value. Unfortunately
@ -11,7 +11,7 @@ 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.
---
hwdb.d/meson.build | 2 +-
hwdb.d/meson.build | 2 +-
meson.build | 11 +++++++----
network/meson.build | 2 +-
src/core/meson.build | 10 +++++-----
@ -27,14 +27,14 @@ store again, while having executables looking up files in /etc.
src/udev/meson.build | 4 ++--
sysctl.d/meson.build | 2 +-
tmpfiles.d/meson.build | 2 +-
units/meson.build | 3 + +-
17 files changed, 30 insertions(+), 26 deletions(-)
units/meson.build | 2 +-
17 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/hwdb.d/meson.build b/hwdb.d/meson.build
index badf39f555..8fd9c7639f 100644
index 4df6dabf89..02d8d69095 100644
--- a/hwdb.d/meson.build
+++ b/hwdb.d/meson.build
@@ -26,7 +26 ,7 @@ if conf.get('ENABLE_HWDB') == 1
@@ -27,7 +27 ,7 @@ if conf.get('ENABLE_HWDB') == 1
install_dir : udevhwdbdir)
meson.add_install_script('sh', '-c',
@ -43,15 +43,11 @@ index badf39f555..8fd9c7639f 100644
meson.add_install_script('sh', '-c',
'test -n "$DESTDIR" || @0@/systemd-hwdb update'
.format(rootbindir))
endif
############################################################
diff --git a/meson.build b/meson.build
index 263cc7189a..7a67078208 100644
index 078db3bb5d..6e1a6483fc 100644
--- a/meson.build
+++ b/meson.build
@@ -151,6 +151 ,9 @@ udevhwdbdir = join_paths(udevlibexecdir, 'hwdb.d')
@@ -154,6 +154 ,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')
@ -61,7 +57,7 @@ index 263cc7189a..7a67078208 100644
bootlibdir = join_paths(prefixdir, 'lib/systemd/boot/efi')
testsdir = join_paths(prefixdir, 'lib/systemd/tests')
systemdstatedir = join_paths(localstatedir, 'lib/systemd')
@@ -2287,7 +2290 ,7 @@ if conf.get('ENABLE_BINFMT') == 1
@@ -2503,7 +2506 ,7 @@ if conf.get('ENABLE_BINFMT') == 1
meson.add_install_script('sh', '-c',
mkdir_p.format(binfmtdir))
meson.add_install_script('sh', '-c',
@ -69,8 +65,8 @@ index 263cc7189a..7a67078208 100644
+ mkdir_p.format(join_paths(factoryconfdir, 'binfmt.d')))
endif
if conf.get('ENABLE_VCONSOLE ') == 1
@@ -2373,7 +2376 ,7 @@ executable('systemd-sleep',
if conf.get('ENABLE_REPART ') == 1
@@ -2604,7 +2607 ,7 @@ executable('systemd-sleep',
install_dir : rootlibexecdir)
install_data('src/sleep/sleep.conf',
@ -79,7 +75,7 @@ index 263cc7189a..7a67078208 100644
exe = executable('systemd-sysctl',
'src/sysctl/sysctl.c',
@@ -2685,7 +2688 ,7 @@ if conf.get('HAVE_KMOD') == 1
@@ -2916,7 +2919 ,7 @@ if conf.get('HAVE_KMOD') == 1
meson.add_install_script('sh', '-c',
mkdir_p.format(modulesloaddir))
meson.add_install_script('sh', '-c',
@ -88,7 +84,7 @@ index 263cc7189a..7a67078208 100644
endif
exe = executable('systemd-nspawn',
@@ -2927,7 +2930 ,7 @@ install_subdir('factory/etc',
@@ -3159,7 +3162 ,7 @@ install_subdir('factory/etc',
install_dir : factorydir)
install_data('xorg/50-systemd-user.sh',
@ -98,10 +94,10 @@ index 263cc7189a..7a67078208 100644
install_dir : modprobedir)
install_data('LICENSE.GPL2',
diff --git a/network/meson.build b/network/meson.build
index 59d4be1a17..72da2c16a2 100644
index 544dcf4387..1828c50863 100644
--- a/network/meson.build
+++ b/network/meson.build
@@ -7,7 +7 ,7 @@ if conf.get('ENABLE_NETWORKD') == 1
@@ -10,7 +10 ,7 @@ if conf.get('ENABLE_NETWORKD') == 1
install_dir : networkdir)
meson.add_install_script('sh', '-c',
@ -111,7 +107,7 @@ index 59d4be1a17..72da2c16a2 100644
install_data('99-default.link',
diff --git a/src/core/meson.build b/src/core/meson.build
index df3aa5c6c1..305f67a80a 100644
index 3586838f59..02ddf1a123 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -179,8 +179,8 @@ libcore = static_library(
@ -125,7 +121,7 @@ index df3aa5c6c1..305f67a80a 100644
['systemd.pc', pkgconfigdatadir],
['triggers.systemd', '']]
@@ -210,6 +210 ,6 @@ meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir))
@@ -212,6 +212 ,6 @@ 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))
@ -207,10 +203,10 @@ index 0a7d3d5440..ff90149c1c 100644
install_data('org.freedesktop.login1.conf',
install_dir : dbuspolicydir)
diff --git a/src/network/meson.build b/src/network/meson.build
index 6bed37a170..35f15bcaf1 100644
index c1c02cfda1..1bfa79a03b 100644
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -168 ,7 +168 ,7 @@ if conf.get('ENABLE_NETWORKD') == 1
@@ -20 1,7 +20 1,7 @@ if conf.get('ENABLE_NETWORKD') == 1
endif
install_data('networkd.conf',
@ -231,10 +227,10 @@ index adbac24b54..e9dc88dfa2 100644
+ install_dir : factorypkgconfdir)
endif
diff --git a/src/resolve/meson.build b/src/resolve/meson.build
index 92b67b6333..ac5b9a0b0a 100644
index c4d8d4e5d9..f550c289a5 100644
--- a/src/resolve/meson.build
+++ b/src/resolve/meson.build
@@ -168,7 +168 ,7 @@ if conf.get('ENABLE_RESOLVE') == 1
@@ -170,7 +170 ,7 @@ if conf.get('ENABLE_RESOLVE') == 1
output : 'resolved.conf',
configuration : substs)
install_data(resolved_conf,
@ -257,10 +253,10 @@ index e5c118c8db..19235df9ca 100644
install_dir : dbuspolicydir)
install_data('org.freedesktop.timesync1.service',
diff --git a/src/udev/meson.build b/src/udev/meson.build
index 511fe428b9..32333efea6 100644
index 173b10be50..82638cf5a9 100644
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -186,7 +186 ,7 @@ foreach prog : [['ata_id/ata_id.c'],
@@ -187,7 +187 ,7 @@ foreach prog : [['ata_id/ata_id.c'],
endforeach
install_data('udev.conf',
@ -269,7 +265,7 @@ index 511fe428b9..32333efea6 100644
configure_file(
input : 'udev.pc.in',
@@ -195,7 +195 ,7 @@ configure_file(
@@ -196,7 +196 ,7 @@ configure_file(
install_dir : pkgconfigdatadir == 'no' ? '' : pkgconfigdatadir)
meson.add_install_script('sh', '-c',
@ -300,10 +296,10 @@ index e77f46d06b..04d2ef621d 100644
+ mkdir_p.format(join_paths(factoryconfdir, 'tmpfiles.d')))
endif
diff --git a/units/meson.build b/units/meson.build
index 476991edba..3d9dc6e1c8 100644
index ea91f0cc9e..8622054ca5 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -308,7 +308 ,7 @@ install_data('user-.slice.d/10-defaults.conf',
@@ -323,7 +323 ,7 @@ install_data('user-.slice.d/10-defaults.conf',
meson.add_install_script(meson_make_symlink,
join_paths(pkgsysconfdir, 'user'),
@ -313,5 +309,5 @@ index 476991edba..3d9dc6e1c8 100644
join_paths(dbussystemservicedir, 'org.freedesktop.systemd1.service'),
join_paths(dbussessionservicedir, 'org.freedesktop.systemd1.service'))
--
2.24.1
2.26.2