dnsmasq: Move D-Bus conf file to share/dbus-1/system.d

Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
This commit is contained in:
worldofpeace 2019-09-15 23:30:58 -04:00
parent 9d0e05233f
commit 2220086061

View file

@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
substituteInPlace $out/Library/LaunchDaemons/uk.org.thekelleys.dnsmasq.plist \ substituteInPlace $out/Library/LaunchDaemons/uk.org.thekelleys.dnsmasq.plist \
--replace "/usr/local/sbin" "$out/bin" --replace "/usr/local/sbin" "$out/bin"
'' + optionalString stdenv.isLinux '' '' + optionalString stdenv.isLinux ''
install -Dm644 dbus/dnsmasq.conf $out/etc/dbus-1/system.d/dnsmasq.conf install -Dm644 dbus/dnsmasq.conf $out/share/dbus-1/system.d/dnsmasq.conf
install -Dm755 contrib/lease-tools/dhcp_lease_time $out/bin/dhcp_lease_time install -Dm755 contrib/lease-tools/dhcp_lease_time $out/bin/dhcp_lease_time
install -Dm755 contrib/lease-tools/dhcp_release $out/bin/dhcp_release install -Dm755 contrib/lease-tools/dhcp_release $out/bin/dhcp_release
install -Dm755 contrib/lease-tools/dhcp_release6 $out/bin/dhcp_release6 install -Dm755 contrib/lease-tools/dhcp_release6 $out/bin/dhcp_release6