From c28dfcad05b7600e853207a1bb2976a5578cb3da Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 2 Mar 2018 12:12:48 -0500 Subject: [PATCH] Move daemon and stub to /usr/libexec I was spending some time investigating how `update_engine` works, and when first starting out it took me a little bit to figure out that there were separate `update_engine_client` vs `update_engine`. Having them both in `/usr/sbin` is annoying for bash completion. This is just a minor "papercut"; I'm mostly using this to test running through the development/contribution process. I am assuming nothing tries to find these binaries directly and only uses the systemd service and/or DBus API; I didn't see any obvious hits in `repo grep update_engine`. Signed-off-by: Colin Walters --- Makefile.am | 7 ++++--- systemd/update-engine-stub.service | 2 +- systemd/update-engine.service | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 29e7f45e..11479678 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,15 +37,16 @@ AM_CFLAGS += -fprofile-arcs -ftest-coverage LDADD += -lgcov endif -sbin_PROGRAMS = update_engine +libexec_PROGRAMS = update_engine bin_PROGRAMS = update_engine_client if ENABLE_DELTA_GENERATOR bin_PROGRAMS += delta_generator endif sbin_SCRIPTS = coreos-postinst \ - coreos-setgoodroot \ - systemd/update_engine_stub + coreos-setgoodroot + +libexec_SCRIPTS= systemd/update_engine_stub noinst_LIBRARIES = libupdate_engine.a diff --git a/systemd/update-engine-stub.service b/systemd/update-engine-stub.service index c9dc071a..2b79a001 100644 --- a/systemd/update-engine-stub.service +++ b/systemd/update-engine-stub.service @@ -5,7 +5,7 @@ ConditionPathExists=/usr/.noupdate [Service] Type=oneshot -ExecStart=/usr/sbin/update_engine_stub +ExecStart=/usr/libexec/update_engine_stub [Install] WantedBy=multi-user.target diff --git a/systemd/update-engine.service b/systemd/update-engine.service index 423fe83d..cf0ffef6 100644 --- a/systemd/update-engine.service +++ b/systemd/update-engine.service @@ -6,7 +6,7 @@ ConditionPathExists=!/usr/.noupdate [Service] Type=dbus BusName=com.coreos.update1 -ExecStart=/usr/sbin/update_engine -foreground -logtostderr +ExecStart=/usr/libexec/update_engine -foreground -logtostderr BlockIOWeight=100 Restart=always RestartSec=30