From patchwork Wed Nov 13 16:29:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Freihofer, Adrian" X-Patchwork-Id: 1194382 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::53d; helo=mail-ed1-x53d.google.com; envelope-from=swupdate+bncbaabbbo7wdxakgqei4ik2fa@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="LI1e+Ww2"; dkim-atps=neutral Received: from mail-ed1-x53d.google.com (mail-ed1-x53d.google.com [IPv6:2a00:1450:4864:20::53d]) (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 47CqpL6x3qz9sPk for ; Thu, 14 Nov 2019 03:30:01 +1100 (AEDT) Received: by mail-ed1-x53d.google.com with SMTP id v4sf1890744edq.22 for ; Wed, 13 Nov 2019 08:30:01 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1573662598; cv=pass; d=google.com; s=arc-20160816; b=S3J2KIG/TPkoFlP6Tfr6Kej+9IcqRSPbOy2v8ZOe/8SfPIFt0gdiH2TtfcAftaAL2O i1xcwMLbWAIlosFujpksODgdZOOpjcrw/1SelWJx35dcV3p8U2vCh7dJrwysGpweSRD4 XQEFYAf9ZDvykUt1p5AXsCIeirEDZrzMGagR3Rc/Pw1t2EmCSfVV3X14DeiyMLC5T5df +7eRKV4L3s2jWvvCvEI28yjKS9U172cxhSg9ucsO2g5gZtBiAyECEiSBVWsC+5+pHpvB b1z2D8+VdAcNVwRXETIFJSw1wAu7Qi79szXyDuRFj+ddJW/QrMfIAOCh1fqOTfxiS5Aq kLhA== 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:message-id:date:subject:cc:to:from :mime-version:sender:dkim-signature; bh=tJ4+doTQpjN54BJsGU9I3kerF+iEtWzkfx9Hy5nM1/8=; b=WP+2+cDoaYsB2LNEHUeOdClWUoUAgNsEWP2E4lcZrSaxTG259hE3Uy2svVZY7YWbdu q7gkdji8iRZJrOVC4JsCcuOFW9DZfsvBIR5Sw2BUVLAXS5AcWlSXVTHtyw3wsi23+zzY Xr6cm6kVig4k68D0HkLH9++FR5X6xzHCH2VYyZ7ra8VOpa/bjBMBfXGT/Vt5AgvKaTBp NISyTee/5Difry7q/2ivJZHiDFzji5fnPvTez8Gea/n4kRUKqtVzZdN6e+OLG3qTmAfj DUw1YWIcOauZDW9eM1M+U5u6rJlbd63h66p6PEOCKUTMCFOr7o3keLE9nyH6iy4DsMwG BN5g== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.14 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 :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=tJ4+doTQpjN54BJsGU9I3kerF+iEtWzkfx9Hy5nM1/8=; b=LI1e+Ww2aUeW7SBU4/G+xKodz8y0Q+e8zU8QZHeDi4AvGYZ93UTINw02S6IQwaG6XX 1ybp6K/zo/bxw7GVS1j9cYathJQZkPt5WEXTgdnHLhbUQhg8GaXwFPSkQnGaKlszGoy+ /6dKc7Hyf7UxJnEIvh/SpCV91n60ynCoJ4s0EvO2X5DvkJRSOCzb4oCBm152BB9UAOQ9 GOrZD+waLj+2EnBzYfExXomNOfLFNxvvTktfI5hNgLkT8a4qfdAjmDHCNykm5fqtTAQl QlKrRDOpAJsbrssonfDQ0H+XRjggmh2gViG73+CK8CFwHgyQdH28aH+v9Aa+B765r3hL B2Mg== 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: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=tJ4+doTQpjN54BJsGU9I3kerF+iEtWzkfx9Hy5nM1/8=; b=l7nwUe8aZHyfdXhjAZFK4r8YaCA1iZEeoT2+SYSryAnPQ80fhEtsHNxCkUBVXbELDO gWdwnlFphxTvEPOIYWKX80n/qw7je9G6Hs96rf6EmxeVQ6u7+cQuq/L2yfeI531VVWgy O+mq+gr0/G2KLu6dT1oavMzxYml9iyzTRYFcNUC3+oYzGEXv/cfInQ8OP6ANxPgUkzYB lIUCMAw9c7c+DQekTWsO5rGQyuoNVTn9PB7jq5yHkQLWtTDIyQ14HeOFOWuVZjoDnAWO 4dOfLiseY+aboMQHNSN74aFDmXa7E0DgYFLsFL2O1Qa/oeSnerWh9CkAa1REjFdayP2F ppnw== Sender: swupdate@googlegroups.com X-Gm-Message-State: APjAAAUFMzZCYV2kXG1T2qWreuzwnyfm2oDDLDLn/yV8zGHqwlydpq1l DtmXYWOtFPdZPJB178bX480= X-Google-Smtp-Source: APXvYqyfKlTJhjIt5lXNQdplosDJ7w5B9mVMiy7BSO1t3oVIWVIuPOnGLgTZPFEmX/RRl6WcSVpLmQ== X-Received: by 2002:a17:906:5e05:: with SMTP id n5mr3646694eju.116.1573662597802; Wed, 13 Nov 2019 08:29:57 -0800 (PST) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a17:906:590b:: with SMTP id h11ls655293ejq.10.gmail; Wed, 13 Nov 2019 08:29:57 -0800 (PST) X-Received: by 2002:a17:906:4e94:: with SMTP id v20mr3735694eju.34.1573662597160; Wed, 13 Nov 2019 08:29:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573662597; cv=none; d=google.com; s=arc-20160816; b=a3+N1Cb8aIPjI498qX7uSm3oW4iv6Sqc/u2+B3dRdQ9lxARszReSCLAJsSRlZN/A99 T4AbzvazmVaw08gIll11C/53EH1Q5MrRMcB+nw48pN4XoY1elFQ0POElMzCGNardPmC9 7WotGQfNmEewCpeZXDnn4E8vV9uSqYP28icsEY2gYljE+ZP6uHvalZzxR6wQaW/kmHJ3 BLK21TY9Jha9pwhkbJduMIR4WuXXA08HHjIkdDlgK0O1XwYYsJI5pllfSqs5WOkgqSsC ZnVRRP64nyHniSB+nCB7KpoatDOmuqDNNYGnDWVBDls8YzpjfUwMZGXnIM/3PRdwkG2v M3LA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from; bh=xUc7WzLPrLfQR04/TxWbzxIF6zZq9CVV5dIyP4HPSpA=; b=LfFzLxFtvLoAXC84aJH0mMuLQDgMrv6L5k57XzLECG3PdoygtS41/NkhQf6bgxDLBN EF529HJwqvUV1zIkDWJwAza27n0y13Cm6HnvLlXeSIry7xRBu1b9W/cdIEFx9t7FG535 z3XrzJHxpqBQsk/bv6Ehn1mh9IFYdRWDzg4hJcwFdyTKLVL6zpK0pbyVqT+05hAPwEgI /HvrUgcdr1fCtLTfTnlIqaA5ViKOr/9Wahp0JnJn2pr5boXLxXQjx6oIyOo2qx2Hph3z 93bK2PVj2l+w17+gT1dXJ+sSHOg304Ha2BqyFTnBLLEzqNd1dhERQ1x0s3vmHrtoXpv/ 77Dw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id q17si325532edi.1.2019.11.13.08.29.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Nov 2019 08:29:57 -0800 (PST) Received-SPF: pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id xADGTuFL016820 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 13 Nov 2019 17:29:56 +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 xADGTu2U018283; Wed, 13 Nov 2019 17:29:56 +0100 Received: from dev.localdomain (localhost [127.0.0.1]) by dev.vm6.ccp.siemens.com (Postfix) with ESMTP id 02CB32353A50; Wed, 13 Nov 2019 17:29:56 +0100 (CET) From: Adrian Freihofer To: swupdate@googlegroups.com Cc: Adrian Freihofer Subject: [swupdate] [PATCH] Revert "systemd generic startup" Date: Wed, 13 Nov 2019 17:29:41 +0100 Message-Id: <20191113162941.16064-1-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.11.0 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.14 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 commit bdc1d3ca06385a3ccb6e34bc74dc9d431a02d3fa. --- Makefile | 20 -------------------- 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 -- 10 files changed, 12 insertions(+), 109 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/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/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