diff options
author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
---|---|---|
committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch | |
parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch index d1961d32f9fb..a2d08753d4df 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch @@ -16,6 +16,7 @@ store again, while having executables looking up files in /etc. network/meson.build | 2 +- src/core/meson.build | 10 +++++----- src/coredump/meson.build | 2 +- + src/home/meson.build | 2 +- src/journal-remote/meson.build | 4 ++-- src/journal/meson.build | 2 +- src/kernel-install/meson.build | 2 +- @@ -28,7 +29,7 @@ store again, while having executables looking up files in /etc. sysctl.d/meson.build | 2 +- tmpfiles.d/meson.build | 2 +- units/meson.build | 2 +- - 17 files changed, 29 insertions(+), 26 deletions(-) + 18 files changed, 30 insertions(+), 27 deletions(-) diff --git a/hwdb.d/meson.build b/hwdb.d/meson.build index 5c77387a26..6404bc01ba 100644 @@ -144,6 +145,17 @@ index 7fa5942697..34c865dfa0 100644 endif tests += [ +diff --git a/src/home/meson.build b/src/home/meson.build +index 797f3a3c6d..232904ab42 100644 +--- a/src/home/meson.build ++++ b/src/home/meson.build +@@ -98,5 +98,5 @@ if conf.get('ENABLE_HOMED') == 1 + install_dir : polkitpolicydir) + + install_data('homed.conf', +- install_dir : pkgsysconfdir) ++ install_dir : factoryconfdir) + endif diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build index 87b8ba6495..daff8ec967 100644 --- a/src/journal-remote/meson.build |