From patchwork Thu Nov 14 16:49:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Freihofer, Adrian" X-Patchwork-Id: 1194967 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::439; helo=mail-wr1-x439.google.com; envelope-from=swupdate+bncbaabbjmlw3xakgqezegntwi@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="XPdZbUpc"; dkim-atps=neutral Received: from mail-wr1-x439.google.com (mail-wr1-x439.google.com [IPv6:2a00:1450:4864:20::439]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47DSBd60wMz9sP4 for ; Fri, 15 Nov 2019 03:49:44 +1100 (AEDT) Received: by mail-wr1-x439.google.com with SMTP id v6sf4701438wrm.18 for ; Thu, 14 Nov 2019 08:49:44 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1573750181; cv=pass; d=google.com; s=arc-20160816; b=KeQJqBCCK0KK9L69O9GutgFDyf5pyMk5lLUuO+HMPDhjnSILPULzUL5DRzuNRmV4EV Fnr1IafD/Aap+8gAsjxtSXKNpVUf7Pxh5bS1ZeTwXM4314Z0Ra7JStyuhFB/eI5KE0Xq K3scZirJ43k8TA/c0ztrLXLb7UPqibYqXkLeD8OSvxn2zxrI7ozMh78KP5irZxRM1sYT Ra6rszV0n6h1TfRRG/bfu1NqXRa8YvaZtlvd/42r1FEQ37xNiRlLPw3VHs4HF/X+znhV BHlzZsqDOCTEtQyJ3z7mSbTOLO7eXSWjyRiE1LE4hiQQN5tF5QGCcKVxXwGDP/7utlpd HOIQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:mime-version:sender:dkim-signature; bh=J7IF9AtLV/d7wDeCDihGBJVWvBTBHr9DzEVztwsPtkg=; b=S5GiIxz/Zb9CrkQv+QCghLRNvfBmI7bX75RU3bD5m1gFJq/Am7Pm0VmhoX6YJ1FozS 2/95sgmYh5HsLYsEJDmQniQG5Elqg+3luCh4NNnjJ1YmEO+B0+o8o7pIDIgBqZEq0RU2 jQ3icQTvwBfkTdTmqP0FIyoFumQTmodSUtZPLE4gi9pMQ+Dwdm7x/6+xYVsJmAnCVDLq Cd3duxfPhkhg2uD1UmCN4frjl0xEJaD2kgV7Kj4Ogyw07OHIvmPMYTtIJspQ3/en/eMG V0ZSZqqic5q1poDgPEbySN1160Fi7bx/3spP+uCvTqbD+uBdExR1wZamuUsaTKkm7sOn UEbA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=J7IF9AtLV/d7wDeCDihGBJVWvBTBHr9DzEVztwsPtkg=; b=XPdZbUpcJ+9/zYEBOOeKFj1Ay6xVYnzeJYPlQTp8lTbGEBagFHCJve0jSojYsDrmsX etTX9vhjwzLm3PtwNO75du+BJu7f8WcLhdRwxvmcXB15PklvtTLMS7R9vJA78Z9HnVvm hbDs8uWG98eY66s09/TGi3kU7+iQPl82V4RxcAFJfym8nGIb0xwvV4gf1zYudTxOSGrz 2qOTOGF6GTQ8BrOyMdObSsMeSIk/HKvZOV0wqHKG5zW/ol3kO4ZdfhYfSdd9QuPztqXg RDXbCp3Frv1sPs6axLvo0wChCM0+0PcUi+rbnDN4viBfR/o9VoySExXGerZJyqCJCWg+ lOqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=J7IF9AtLV/d7wDeCDihGBJVWvBTBHr9DzEVztwsPtkg=; b=iRf9idX5rFT06yQ7Zr6SEmZiux7SOYaFKCddjRucN/s/JM5B0OVesNCivWnOpSsEhe QARBQaaNcRWHzK4vhSoNnC4U+J1IFMgyrBR4itd7RtJ9QVQhMLNcrnowxz2B0ipu9xGK YvZ9ob6HrWFONVYPuS6Vhrq6Ce0jqLVYpdFjgVtAMPR/IrSpHWy9XyTIRPhzaKpCv2PI cWbUB07wieJyEPldLjg5x1fmzUNVoNeJg/7eGJKqsWX0hYABYP4R9kg/g50UcES881Z2 gLhilZknOO0AkicVVbEml+vw2Pb7KWgcGGZ6ZcglLdBVnYNF+DIoLVJX0mwP+bszotmk dL6w== Sender: swupdate@googlegroups.com X-Gm-Message-State: APjAAAWpSs9dc08QytjJZycay1k4Ps0jiBvIfRGpqrGpcavQM2cfuKus xL2ECy1PqbEwWMVjLGLE8MA= X-Google-Smtp-Source: APXvYqwBdBzqXQNUHAXzrt49T7ejb1rkDk6HvQBFwoccHww2wHWtC1k2kZMToYcPUMunhl/g+s8CcA== X-Received: by 2002:a1c:1fca:: with SMTP id f193mr8158357wmf.173.1573750181526; Thu, 14 Nov 2019 08:49:41 -0800 (PST) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a5d:5512:: with SMTP id b18ls8486867wrv.16.gmail; Thu, 14 Nov 2019 08:49:41 -0800 (PST) X-Received: by 2002:a5d:4a45:: with SMTP id v5mr5706138wrs.288.1573750181023; Thu, 14 Nov 2019 08:49:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573750181; cv=none; d=google.com; s=arc-20160816; b=vQOZv9K5hDUz/lZfsQtrRP6BF5whw3mnainybdBMjWzimYbDy0ZVDVY/6XGKgJm88O ol/BBzj9TtnyzuLyUXe2i7noZd8JQIBYhuRuPkdbeV+ieRZ/TXIwSSs5fftZ5PY/KrV3 rm4rkJjmo2GkvVNvCPI3g+EsWAnnP6A+4ihYDnkzBm+qWthNuEM9rArGjhiZVFnQmS0B VE6hE6VZpsxXuNT/jSinyRhxg26aDcnAb0DP+nc8XVIe0uemLhkkuPrZn7sLwxAInwG1 qx0xCKshhBQm+tE/iBVsRLPAujAHZhOPJ0ZoIuqPPZ+vLlo9IFXKPB81X3KjGOLFW9DZ FLCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=jqQL5+tdHr26HiK6Z1G0L32zZFfRZbF2YCqvJKC27xU=; b=ILknckUygNTbu1bYnfwHK+ugZ61/+ZYcmX1sZVArZLLMifh99RcpRHX8V6NrNaU2yK 0CD9KJypwwxwA2d1vecmUl6MVyiz+dhRpsIZgb4dsEuQPXhlvERdd3TOmNSQgcYCTUQR N166GtTCHBbZspQCUZ88/BZIceHxzKhpKVzWXEBR+w2PPBPzvp2CB2Vr5it2O8Nbv3IZ wLUXrdyZf7hXuZbGeaPlCs/PF+KNs5LIuBlQ5yPSJjntVnwsP3yxLA+IVsIZg09CWoAq Uuif5TN1s0xkSFnA6NYnwPKKoF6bwT8754XrGOdHm15s9JXgz+vcpkai3OxLOIYjSW9S kurg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id y140si369020wmd.0.2019.11.14.08.49.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Nov 2019 08:49:40 -0800 (PST) Received-SPF: pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id xAEGneLo019008 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 14 Nov 2019 17:49:40 +0100 Received: from dev.vm6.ccp.siemens.com (md1w1dqc.ad001.siemens.net [139.16.116.76]) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id xAEGndMN003109; Thu, 14 Nov 2019 17:49:39 +0100 Received: from dev.localdomain (localhost [127.0.0.1]) by dev.vm6.ccp.siemens.com (Postfix) with ESMTP id 901362353A50; Thu, 14 Nov 2019 17:49:39 +0100 (CET) From: Adrian Freihofer To: swupdate@googlegroups.com Cc: Adrian Freihofer Subject: [swupdate] [PATCH v2 1/1] Revert "systemd generic startup" Date: Thu, 14 Nov 2019 17:49:34 +0100 Message-Id: <20191114164934.18921-2-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191114164934.18921-1-adrian.freihofer@siemens.com> References: <20191114164934.18921-1-adrian.freihofer@siemens.com> X-Original-Sender: adrian.freihofer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Installing the service files from swupdate's Makefile did not proof to work well. In conjunction with the kbuild-system this approach introduces some circular dependencies between the menuconfig and the distro build-system such as Yocto. Lets keep the systemd service files and the related scripts in the meta-swupdate repo and add also the new shell configuration features to meta-swupdate. This reverts commits bdc1d3ca06385a3ccb6e34bc74dc9d431a02d3fa 75985aab9e0ab7b12185d5d512c68cf74aa0e3b0 Signed-off-by: Adrian Freihofer --- Kconfig | 12 ------------ Makefile | 20 -------------------- Makefile.flags | 3 --- doc/source/swupdate.rst | 29 ++++++++++++----------------- startup/systemd/10-mongoose-args | 1 - startup/systemd/swupdate-progress.service | 9 --------- startup/systemd/swupdate-usb.rules | 2 -- startup/systemd/swupdate-usb@.service | 8 -------- startup/systemd/swupdate.service | 11 ----------- startup/systemd/swupdate.sh | 28 ---------------------------- startup/systemd/swupdate.socket | 11 ----------- startup/systemd/tmpfiles-swupdate.conf | 2 -- 12 files changed, 12 insertions(+), 124 deletions(-) delete mode 100644 startup/systemd/10-mongoose-args delete mode 100644 startup/systemd/swupdate-progress.service delete mode 100644 startup/systemd/swupdate-usb.rules delete mode 100644 startup/systemd/swupdate-usb@.service delete mode 100644 startup/systemd/swupdate.service delete mode 100644 startup/systemd/swupdate.sh delete mode 100644 startup/systemd/swupdate.socket delete mode 100644 startup/systemd/tmpfiles-swupdate.conf diff --git a/Kconfig b/Kconfig index 506d086..6f1e7ad 100644 --- a/Kconfig +++ b/Kconfig @@ -109,18 +109,6 @@ config SYSTEMD Enable support for systemd's start-up completion notification and socket-based activation features. -config SYSTEMD_SYSTEM_UNITDIR - string "installation path for systemd unit files" - depends on SYSTEMD - default "" - help - Defines the path where systemd service and socket files get - installed to. By default (empty string) the systemd files - are installed to the path provided by the SYSTEMD_SYSTEM_UNITDIR - environment variable or are not installed if this variable is - undefined. To install a set of service files without defining - environment variables, you may set this to /lib/systemd/system. - config SCRIPTS bool "enable pre and postinstall scripts" default y diff --git a/Makefile b/Makefile index 9b7f640..22d98c8 100644 --- a/Makefile +++ b/Makefile @@ -461,26 +461,6 @@ install: all install -d ${DESTDIR}/usr/lib/lua/$(LUAVER); \ install -m 0755 ${lua_swupdate} $(DESTDIR)/usr/lib/lua/$(LUAVER); \ fi - if [ "x${SYSTEMD_SYSTEM_UNITDIR}" != "x" ]; then \ - install -d ${DESTDIR}${SYSTEMD_SYSTEM_UNITDIR}; \ - install -d ${DESTDIR}/usr/lib/swupdate/conf.d; \ - install -m 755 startup/systemd/swupdate.sh ${DESTDIR}/usr/lib/swupdate; \ - install -m 644 startup/systemd/swupdate-progress.service ${DESTDIR}${SYSTEMD_SYSTEM_UNITDIR}; \ - install -m 644 startup/systemd/swupdate-usb@.service ${DESTDIR}${SYSTEMD_SYSTEM_UNITDIR}; \ - install -m 644 startup/systemd/swupdate.socket ${DESTDIR}${SYSTEMD_SYSTEM_UNITDIR}; \ - ctrl_path=${CONFIG_SOCKET_CTRL_PATH}; progr_path=${CONFIG_SOCKET_PROGRESS_PATH}; \ - sed -i -e "s,@@SOCKET_CTRL_PATH@@,$${ctrl_path},g" \ - -e "s,@@SOCKET_PROGRESS_PATH@@,$${progr_path},g" \ - ${DESTDIR}${SYSTEMD_SYSTEM_UNITDIR}/swupdate.socket; \ - install -m 644 startup/systemd/swupdate.service ${DESTDIR}${SYSTEMD_SYSTEM_UNITDIR}; \ - install -d ${DESTDIR}/usr/lib/tmpfiles.d; \ - install -m 0644 startup/systemd/tmpfiles-swupdate.conf ${DESTDIR}/usr/lib/tmpfiles.d/swupdate.conf; \ - install -d ${DESTDIR}/etc/udev/rules.d; \ - install -m 0644 startup/systemd/swupdate-usb.rules ${DESTDIR}/etc/udev/rules.d/; \ - if [ "x$(CONFIG_MONGOOSE)" == "xy" ]; then \ - install -m 644 startup/systemd/10-mongoose-args ${DESTDIR}/usr/lib/swupdate/conf.d/; \ - fi; \ - fi PHONY += run-tests tests: \ diff --git a/Makefile.flags b/Makefile.flags index 38db720..614d772 100644 --- a/Makefile.flags +++ b/Makefile.flags @@ -184,9 +184,6 @@ endif ifeq ($(CONFIG_SYSTEMD),y) LDLIBS += systemd -ifneq ($(CONFIG_SYSTEMD_SYSTEM_UNITDIR),) -export SYSTEMD_SYSTEM_UNITDIR=$(CONFIG_SYSTEMD_SYSTEM_UNITDIR) -endif endif ifeq ($(CONFIG_BOOTLOADER_EBG),y) diff --git a/doc/source/swupdate.rst b/doc/source/swupdate.rst index 6c7a98e..35fa656 100644 --- a/doc/source/swupdate.rst +++ b/doc/source/swupdate.rst @@ -522,27 +522,22 @@ configuration switch ``CONFIG_SYSTEMD``. If enabled, SWUpdate signals systemd about start-up completion and can make optional use of systemd's socket-based activation feature. -To install a generic set of service and socket files, pass the -`SYSTEMD_SYSTEM_UNITDIR` parameter, which points to `/lib/systemd/system` -for example, to the "make install" command. - -For further runtime adjustments, some shell code snippets can be added -to the `/usr/lib/swupdate/conf.d` or `/etc/swupdate/conf.d` folders. The -code snippets are processed by a full-featured shell in alphabetical order. -Files from /etc overwrite files from /usr/ with the same name. +A sample systemd service unit file ``/etc/systemd/system/swupdate.service`` +may look like the following starting SWUpdate in suricatta daemon mode: -The purpose of these code snippets is to assign reasonable command line -parameters to swupdate. The following variables may be set: +:: -- SWUPDATE_ARGS -- SWUPDATE_WEBSERVER_ARGS -- SWUPDATE_DOWNLOAD_ARGS + [Unit] + Description=SWUpdate daemon + Documentation=https://github.com/sbabic/swupdate + Documentation=https://sbabic.github.io/swupdate -A sample configuration file ``/usr/lib/swupdate/conf.d/10-suricatta`` -may look like the following starting SWUpdate in suricatta daemon mode: -:: + [Service] + Type=notify + ExecStart=/usr/bin/swupdate -u '-t default -u http://localhost -i 25' - SWUPDATE_DOWNLOAD_ARGS='-t default -u http://localhost -i 25' + [Install] + WantedBy=multi-user.target Started via ``systemctl start swupdate.service``, SWUpdate (re)creates its sockets on startup. For using socket-based diff --git a/startup/systemd/10-mongoose-args b/startup/systemd/10-mongoose-args deleted file mode 100644 index 896e66b..0000000 --- a/startup/systemd/10-mongoose-args +++ /dev/null @@ -1 +0,0 @@ -SWUPDATE_WEBSERVER_ARGS="-r /www ${SWUPDATE_MONGOOSE_EXTRA_ARGS:--p 8080}" diff --git a/startup/systemd/swupdate-progress.service b/startup/systemd/swupdate-progress.service deleted file mode 100644 index 212d151..0000000 --- a/startup/systemd/swupdate-progress.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=swupdate progress service -Before=swupdate.service - -[Service] -ExecStart=/usr/bin/swupdate-progress -r -w - -[Install] -WantedBy=swupdate.service diff --git a/startup/systemd/swupdate-usb.rules b/startup/systemd/swupdate-usb.rules deleted file mode 100644 index 7bba227..0000000 --- a/startup/systemd/swupdate-usb.rules +++ /dev/null @@ -1,2 +0,0 @@ -ACTION=="add", KERNEL=="sd*", SUBSYSTEM=="block", ENV{ID_FS_USAGE}=="filesystem", TAG+="systemd", ENV{SYSTEMD_WANTS}+="swupdate-usb@%k.service" - diff --git a/startup/systemd/swupdate-usb@.service b/startup/systemd/swupdate-usb@.service deleted file mode 100644 index eda9d15..0000000 --- a/startup/systemd/swupdate-usb@.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=usb media swupdate service -Requires=swupdate-progress.service - -[Service] -ExecStartPre=/bin/mount /dev/%I /mnt -ExecStart=/bin/sh -c "swupdate-client -v /mnt/*.swu" -ExecStopPost=/bin/umount /mnt diff --git a/startup/systemd/swupdate.service b/startup/systemd/swupdate.service deleted file mode 100644 index a3d8d19..0000000 --- a/startup/systemd/swupdate.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=SWUpdate daemon -Documentation=https://github.com/sbabic/swupdate -Documentation=https://sbabic.github.io/swupdate - -[Service] -ExecStart=/usr/lib/swupdate/swupdate.sh -KillMode=mixed - -[Install] -WantedBy=multi-user.target diff --git a/startup/systemd/swupdate.sh b/startup/systemd/swupdate.sh deleted file mode 100644 index d93ec85..0000000 --- a/startup/systemd/swupdate.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -# Override these variables in sourced script(s) located -# in /usr/lib/swupdate/conf.d or /etc/swupdate/conf.d -SWUPDATE_ARGS="-v ${SWUPDATE_EXTRA_ARGS}" -SWUPDATE_WEBSERVER_ARGS="" -SWUPDATE_DOWNLOAD_ARGS="" - -# source all files from /etc/swupdate/conf.d and /usr/lib/swupdate/conf.d/ -# A file found in /etc replaces the same file in /usr -for f in `(test -d /usr/lib/swupdate/conf.d/ && ls -1 /usr/lib/swupdate/conf.d/; test -d /etc/swupdate/conf.d && ls -1 /etc/swupdate/conf.d) | sort -u`; do - if [ -f /etc/swupdate/conf.d/$f ]; then - . /etc/swupdate/conf.d/$f - else - . /usr/lib/swupdate/conf.d/$f - fi -done - -# handle variable escaping in a simmple way. Use exec to forward open filedescriptors from systemd open. -if [ "$SWUPDATE_WEBSERVER_ARGS" != "" -a "$SWUPDATE_DOWNLOAD_ARGS" != "" ]; then - exec /usr/bin/swupdate $SWUPDATE_ARGS -w "$SWUPDATE_WEBSERVER_ARGS" -u "$SWUPDATE_DOWNLOAD_ARGS" -elif [ "$SWUPDATE_WEBSERVER_ARGS" != "" ]; then - exec /usr/bin/swupdate $SWUPDATE_ARGS -w "$SWUPDATE_WEBSERVER_ARGS" -elif [ "$SWUPDATE_DOWNLOAD_ARGS" != "" ]; then - exec /usr/bin/swupdate $SWUPDATE_ARGS -d "$SWUPDATE_DOWNLOAD_ARGS" -else - exec /usr/bin/swupdate $SWUPDATE_ARGS -fi diff --git a/startup/systemd/swupdate.socket b/startup/systemd/swupdate.socket deleted file mode 100644 index aeb7310..0000000 --- a/startup/systemd/swupdate.socket +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=SWUpdate socket listener -Documentation=https://github.com/sbabic/swupdate -Documentation=https://sbabic.github.io/swupdate - -[Socket] -ListenStream=@@SOCKET_CTRL_PATH@@ -ListenStream=@@SOCKET_PROGRESS_PATH@@ - -[Install] -WantedBy=sockets.target diff --git a/startup/systemd/tmpfiles-swupdate.conf b/startup/systemd/tmpfiles-swupdate.conf deleted file mode 100644 index 4743672..0000000 --- a/startup/systemd/tmpfiles-swupdate.conf +++ /dev/null @@ -1,2 +0,0 @@ -X /tmp/datadst -X /tmp/scripts