The following pull request was submitted through Github. It can be accessed and reviewed at: https://github.com/lxc/distrobuilder/pull/380
This e-mail was sent by the LXC bot, direct replies will not reach the author unless they happen to be subscribed to this list. === Description (from pull-request) ===
From 42774609e17dd51dd434846c7c153c1a17459b83 Mon Sep 17 00:00:00 2001 From: Thomas Hipp <thomas.h...@canonical.com> Date: Wed, 18 Nov 2020 21:02:04 +0100 Subject: [PATCH] generators: Fix lxd-agent openRC scripts Signed-off-by: Thomas Hipp <thomas.h...@canonical.com> --- generators/lxd-agent.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/lxd-agent.go b/generators/lxd-agent.go index afa49bc..c5af59e 100644 --- a/generators/lxd-agent.go +++ b/generators/lxd-agent.go @@ -218,7 +218,7 @@ required_files=/dev/virtio-ports/org.linuxcontainers.lxd start_pre() { /sbin/modprobe 9pnet_virtio || true # Don't proceed if the config drive is mounted already - mount | grep -q /run/lxd_config/drive && false + mount | grep -q /run/lxd_config/drive && return 1 checkpath -d /run/lxd_config -m 0700 checkpath -d /run/lxd_config/drive } @@ -243,7 +243,7 @@ start_pre() { start_pre() { # Don't proceed if the config drive is mounted already - mount | grep -q /run/lxd_config/drive && false + mount | grep -q /run/lxd_config/drive && return 1 checkpath -d /run/lxd_config -m 0700 checkpath -d /run/lxd_config/drive }
_______________________________________________ lxc-devel mailing list lxc-devel@lists.linuxcontainers.org http://lists.linuxcontainers.org/listinfo/lxc-devel