From 31ce2d1a14de6d8439829dc8a046aeaeef734461 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Thu, 8 Oct 2015 22:22:28 +0200 Subject: initial commit for Enea Linux 5.0 arm Signed-off-by: Tudor Florea --- .../lxc-test-attach-replace-cmp-with-grep.patch | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 recipes-containers/lxc/files/lxc-test-attach-replace-cmp-with-grep.patch (limited to 'recipes-containers/lxc/files/lxc-test-attach-replace-cmp-with-grep.patch') diff --git a/recipes-containers/lxc/files/lxc-test-attach-replace-cmp-with-grep.patch b/recipes-containers/lxc/files/lxc-test-attach-replace-cmp-with-grep.patch new file mode 100644 index 0000000..88d2450 --- /dev/null +++ b/recipes-containers/lxc/files/lxc-test-attach-replace-cmp-with-grep.patch @@ -0,0 +1,24 @@ +lxc: Update lxc-test-attach + +For Enea Linux, the SysV init file is different from busybox, causing cmp to +return an error. In order to preserve the test's logic it was replaced with a +command which succeeds in every situation: +(e.g. search for root in /etc/passwd using grep). + +Upstream-Status: Pending + +Signed-off-by: Petre Pircalabu + +--- a/src/tests/attach.c ++++ b/src/tests/attach.c +@@ -237,8 +237,8 @@ static int test_attach_cmd(struct lxc_co + { + int ret; + pid_t pid; +- char *argv[] = {"cmp", "-s", "/sbin/init", "/bin/busybox", NULL}; +- lxc_attach_command_t command = {"cmp", argv}; ++ char *argv[] = {"grep", "-q", "root", "/etc/passwd", NULL}; ++ lxc_attach_command_t command = {"grep", argv}; + lxc_attach_options_t attach_options = LXC_ATTACH_OPTIONS_DEFAULT; + + TSTOUT("Testing attach with success command...\n"); -- cgit v1.2.3-54-g00ecf