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

Message ID 20191103165640.21819-16-jeremy.rosen@smile.fr
State Superseded
Headers show
Series
  • use host-systemd to enable units
Related show

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

Patch
diff mbox series

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))