[lxc-devel] [lxd/master] test: Fix busybox image

monstermunchkin on Github lxc-bot at linuxcontainers.org
Tue May 8 16:26:18 UTC 2018


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 355 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20180508/f0682d7c/attachment.bin>
-------------- next part --------------
From d1900772eaefe3ec1069c3aa467c0042feb756ab Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.hipp at canonical.com>
Date: Tue, 8 May 2018 18:18:31 +0200
Subject: [PATCH] test: Fix busybox image

Signed-off-by: Thomas Hipp <thomas.hipp at canonical.com>
---
 test/deps/import-busybox | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/deps/import-busybox b/test/deps/import-busybox
index bcd44ed14..d0fa0c5fd 100755
--- a/test/deps/import-busybox
+++ b/test/deps/import-busybox
@@ -215,7 +215,8 @@ class Busybox(object):
         busybox.wait()
 
         for path in busybox.stdout.read().split("\n"):
-            if not path.strip():
+            # Prevent filesystem loop
+            if not path.strip() or path.strip() == "bin/busybox":
                 continue
 
             symlink_file = tarfile.TarInfo()


More information about the lxc-devel mailing list