Merge pull request #88492 from flokli/current-system-systemctl

tree-wide: use systemctl of running system
This commit is contained in:
Florian Klink
2020-05-21 20:22:26 +02:00
committed by GitHub
17 changed files with 28 additions and 28 deletions

View File

@@ -34,7 +34,7 @@ in
SYSTEMD_UNIT_DIR=/lib/systemd/system \
UDEV_RULES_DIR=/etc/udev/rules.d
substituteInPlace $out/etc/udev/rules.d/40-monitor-hotplug.rules \
--replace /bin/systemctl "${systemd}/bin/systemctl"
--replace /bin/systemctl "/run/current-system/systemd/bin/systemctl"
'' else ''
make install TARGETS='pmutils' DESTDIR=$out \
PM_SLEEPHOOKS_DIR=/lib/pm-utils/sleep.d

View File

@@ -29,7 +29,7 @@ buildPythonApplication rec {
postPatch = ''
for file in $(find google_compute_engine -type f); do
substituteInPlace "$file" \
--replace /bin/systemctl "/run/current-system/sw/bin/systemctl" \
--replace /bin/systemctl "/run/current-system/systemd/bin/systemctl" \
--replace /bin/bash "${bashInteractive}/bin/bash" \
--replace /sbin/hwclock "${utillinux}/bin/hwclock"
# SELinux tool ??? /sbin/restorecon