[15/15] package/tor: adapt to preset-all

Message ID	20191103165640.21819-16-jeremy.rosen@smile.fr
State	Superseded
Headers	show Return-Path: <buildroot-bounces@busybox.net> From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= <jeremy.rosen@smile.fr> To: buildroot@buildroot.org Date: Sun, 3 Nov 2019 17:56:40 +0100 Message-Id: <20191103165640.21819-16-jeremy.rosen@smile.fr> In-Reply-To: <20191103165640.21819-1-jeremy.rosen@smile.fr> References: <20191103165640.21819-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 15/15] package/tor: adapt to preset-all Precedence: list Cc: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= <jeremy.rosen@smile.fr> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" <buildroot-bounces@busybox.net>
Series	use host-systemd to enable units \| expand [00/15] use host-systemd to enable units [01/15] new recipe : host-systemd [02/15] use host-systemctl preset all to enable units [03/15] fix tty handling [04/15] fix trivial packages with buildroot-provided services [05/15] fix trivial cases, upstream-provided services [06/15] package/avahi: adapt to preset-all [07/15] package/connman: adapt to preset-all [08/15] package/dante: adapt to preset-all [09/15] package/linuxptp adapt to preset-all [10/15] package/docker-engine: adapt to preset-all [11/15] package/network-manager: adapt to preset-all [12/15] package/wpa_supplicant: adapt for preset-all [13/15] package/sysklogd: adapt to preset-all [14/15] package/targetcli-fb: adapt to preset-all [15/15] package/tor: adapt to preset-all

Message ID

20191103165640.21819-16-jeremy.rosen@smile.fr

State

Superseded

Headers

From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= <jeremy.rosen@smile.fr>
To: buildroot@buildroot.org
Date: Sun,  3 Nov 2019 17:56:40 +0100
Message-Id: <20191103165640.21819-16-jeremy.rosen@smile.fr>
In-Reply-To: <20191103165640.21819-1-jeremy.rosen@smile.fr>
References: <20191103165640.21819-1-jeremy.rosen@smile.fr>
MIME-Version: 1.0
Subject: [Buildroot] [PATCH 15/15] package/tor: adapt to preset-all
Precedence: list
Cc: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= <jeremy.rosen@smile.fr>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Errors-To: buildroot-bounces@busybox.net
Sender: "buildroot" <buildroot-bounces@busybox.net>

Series

use host-systemd to enable units | expand

Commit Message

Jérémy ROSEN Nov. 3, 2019, 4:56 p.m. UTC

tor was not enabled, we now need to disable it explicitely

Signed-off-by: Jérémy Rosen <jeremy.rosen@smile.fr>
---
 package/tor/50-tor.preset | 1 +
 package/tor/tor.mk        | 2 ++
 2 files changed, 3 insertions(+)
 create mode 100644 package/tor/50-tor.preset

Comments

James Hilliard Nov. 3, 2019, 5:31 p.m. UTC | #1

On Sun, Nov 3, 2019 at 11:57 AM Jérémy Rosen <jeremy.rosen@smile.fr> wrote:
>
> tor was not enabled, we now need to disable it explicitly
Tor not being enabled seems to be a bug so we should not disable it.
>
> Signed-off-by: Jérémy Rosen <jeremy.rosen@smile.fr>
> ---
>  package/tor/50-tor.preset | 1 +
>  package/tor/tor.mk        | 2 ++
>  2 files changed, 3 insertions(+)
>  create mode 100644 package/tor/50-tor.preset
>
> diff --git a/package/tor/50-tor.preset b/package/tor/50-tor.preset
> new file mode 100644
> index 0000000000..8664cb9ca5
> --- /dev/null
> +++ b/package/tor/50-tor.preset
> @@ -0,0 +1 @@
> +disable tor.service
> diff --git a/package/tor/tor.mk b/package/tor/tor.mk
> index 264d8d06da..2785c1a518 100644
> --- a/package/tor/tor.mk
> +++ b/package/tor/tor.mk
> @@ -61,6 +61,8 @@ TOR_POST_INSTALL_TARGET_HOOKS += TOR_INSTALL_CONF
>  define TOR_INSTALL_INIT_SYSTEMD
>         $(INSTALL) -D -m 644 $(@D)/contrib/dist/tor.service \
>                 $(TARGET_DIR)/usr/lib/systemd/system/tor.service
> +       $(INSTALL) -D -m 644 package/tor/50-tor.preset \
> +               $(TARGET_DIR)/usr/lib/systemd/system-preset/50-tor.preset
>  endef
>
>  $(eval $(autotools-package))
> --
> 2.24.0.rc1
>
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

diff --git a/package/tor/50-tor.preset b/package/tor/50-tor.preset
new file mode 100644
index 0000000000..8664cb9ca5
--- /dev/null
+++ b/package/tor/50-tor.preset
@@ -0,0 +1 @@ 
+disable tor.service
diff --git a/package/tor/tor.mk b/package/tor/tor.mk
index 264d8d06da..2785c1a518 100644
--- a/package/tor/tor.mk
+++ b/package/tor/tor.mk
@@ -61,6 +61,8 @@  TOR_POST_INSTALL_TARGET_HOOKS += TOR_INSTALL_CONF
 define TOR_INSTALL_INIT_SYSTEMD
 	$(INSTALL) -D -m 644 $(@D)/contrib/dist/tor.service \
 		$(TARGET_DIR)/usr/lib/systemd/system/tor.service
+	$(INSTALL) -D -m 644 package/tor/50-tor.preset \
+		$(TARGET_DIR)/usr/lib/systemd/system-preset/50-tor.preset
 endef
 
 $(eval $(autotools-package))

[15/15] package/tor: adapt to preset-all

Commit Message

Comments

Patch