From e227e9a919f403e9a5253675c368f8636df0a136 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Sat, 16 Aug 2025 18:29:19 -0700 Subject: [PATCH] Makefile: Move privileged daemon to /usr/lib/freedombox Tests: - Running make install installs to /usr/lib/freedombox. Non-privileged users don't find it in the path. root user does. - New service file contains path to /usr/lib/freedombox/. Actions works as expected. - Build and install the debian package. Privileged daemon runs as expected and first setup steps complete as expected. First wizard works as expected. Signed-off-by: Sunil Mohan Adapa Reviewed-by: Veiko Aasa --- Makefile | 3 ++- data/usr/lib/systemd/system/freedombox-privileged.service | 2 +- debian/freedombox.lintian-overrides | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fecc2c3ba..db908fbf1 100644 --- a/Makefile +++ b/Makefile @@ -37,6 +37,7 @@ DIRECTORIES_TO_CREATE := \ STATIC_FILES_DIRECTORY := $(DESTDIR)/usr/share/plinth/static BIN_DIR := $(DESTDIR)/usr/bin +LIB_DIR := $(DESTDIR)/usr/lib FIND_ARGS := \ -not -iname "*.log" \ @@ -102,7 +103,7 @@ install: rm -f $(DESTDIR)$${lib_dir}/plinth*.dist-info/COPYING.md && \ rm -f $(DESTDIR)$${lib_dir}/plinth*.dist-info/direct_url.json && \ $(INSTALL) -D -t $(BIN_DIR) bin/plinth - $(INSTALL) -D -t $(BIN_DIR) bin/freedombox-privileged + $(INSTALL) -D -t $(LIB_DIR)/freedombox bin/freedombox-privileged $(INSTALL) -D -t $(BIN_DIR) bin/freedombox-cmd # Static web server files diff --git a/data/usr/lib/systemd/system/freedombox-privileged.service b/data/usr/lib/systemd/system/freedombox-privileged.service index 9cce91e34..fe255c94c 100644 --- a/data/usr/lib/systemd/system/freedombox-privileged.service +++ b/data/usr/lib/systemd/system/freedombox-privileged.service @@ -8,7 +8,7 @@ StartLimitIntervalSec=0 [Service] Type=notify -ExecStart=/usr/bin/freedombox-privileged +ExecStart=/usr/lib/freedombox/freedombox-privileged TimeoutSec=300s User=root Group=root diff --git a/debian/freedombox.lintian-overrides b/debian/freedombox.lintian-overrides index 1bda5b605..b3a57a7da 100644 --- a/debian/freedombox.lintian-overrides +++ b/debian/freedombox.lintian-overrides @@ -19,3 +19,8 @@ freedombox binary: web-application-works-only-with-apache # Not documentation freedombox: package-contains-documentation-outside-usr-share-doc [usr/share/plinth/static/jslicense.html] freedombox: package-contains-documentation-outside-usr-share-doc [usr/lib/python3/dist-packages/plinth-*.dist-info/top_level.txt] + +# This executable is meant to executed from systemd service file and is not +# meant for user. However, don't install to /usr/libexec and follow systemd +# convention instead. +freedombox: executable-in-usr-lib [usr/lib/freedombox/freedombox-privileged]