[lxc-devel] [lxc/master] Fix build

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 301 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200316/0fca609d/attachment.bin>
-------------- next part --------------
From 1949358f9db7d271e02b4f2ba12179743ff0aaec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Mon, 7 Oct 2019 19:32:08 -0400
Subject: [PATCH 1/2] doc: Fix grammar
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 doc/lxc-user-nic.sgml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/lxc-user-nic.sgml.in b/doc/lxc-user-nic.sgml.in
index 18e9b22cc3..4663618996 100644
--- a/doc/lxc-user-nic.sgml.in
+++ b/doc/lxc-user-nic.sgml.in
@@ -86,7 +86,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
       <filename>@LXC_USERNIC_DB@</filename>.  It ensures that the calling
       user is privileged over the network namespace to which the interface
       will be attached.
-      <command>lxc-user-nic</command> also allows to delete network devices.
+      <command>lxc-user-nic</command> also allows one to delete network devices.
       Currently only ovs ports can be deleted.
     </para>
 

From 83e280f649d5d4078b569a774060cf04b9d0c8bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Mon, 16 Mar 2020 15:48:32 -0400
Subject: [PATCH 2/2] busybox: Fix bad lxc.mount.entry
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 templates/lxc-busybox.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in
index 2d8e64c4d8..b6fe8f1e17 100644
--- a/templates/lxc-busybox.in
+++ b/templates/lxc-busybox.in
@@ -236,7 +236,7 @@ lxc.cap.drop = sys_module mac_admin mac_override sys_time
 #lxc.apparmor.profile = unconfined
 
 lxc.mount.auto = cgroup:mixed proc:mixed sys:mixed
-lxc.mount.entry = shm dev/shm tmpfs defaults 0 0
+lxc.mount.entry = shm dev/shm tmpfs defaults,create=dir 0 0
 EOF
 
   libdirs="\