summaryrefslogtreecommitdiffstats
path: root/recipes-containers/lxc/files/tests-add-no-validate-when-using-download-template.patch
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-07-12 14:40:23 -0400
committerBruce Ashfield <bruce.ashfield@gmail.com>2023-05-19 10:41:34 -0400
commite6b6abacfb3a7273f0e4154010f749252c1eb0a2 (patch)
tree81a2f8f72c0ea12cfdc86efdf63e508aa0143f0e /recipes-containers/lxc/files/tests-add-no-validate-when-using-download-template.patch
parentbeea119eb529b4a11f266004aee8b548427aea39 (diff)
downloadmeta-virtualization-e6b6abacfb3a7273f0e4154010f749252c1eb0a2.tar.gz
lxc: update to 4.0.9
Bumping lxc to a newer 4.0 -stable release. We drop two patches that have been integrated to the upstream repo, but otherwise, things are the same. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers/lxc/files/tests-add-no-validate-when-using-download-template.patch')
-rw-r--r--recipes-containers/lxc/files/tests-add-no-validate-when-using-download-template.patch54
1 files changed, 27 insertions, 27 deletions
diff --git a/recipes-containers/lxc/files/tests-add-no-validate-when-using-download-template.patch b/recipes-containers/lxc/files/tests-add-no-validate-when-using-download-template.patch
index 8caeb2ba..f335e796 100644
--- a/recipes-containers/lxc/files/tests-add-no-validate-when-using-download-template.patch
+++ b/recipes-containers/lxc/files/tests-add-no-validate-when-using-download-template.patch
@@ -18,11 +18,11 @@ Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
18 src/tests/lxc-test-usernic.in | 2 +- 18 src/tests/lxc-test-usernic.in | 2 +-
19 5 files changed, 5 insertions(+), 5 deletions(-) 19 5 files changed, 5 insertions(+), 5 deletions(-)
20 20
21diff --git a/src/tests/lxc-test-apparmor-mount b/src/tests/lxc-test-apparmor-mount 21Index: lxc-4.0.9/src/tests/lxc-test-apparmor-mount
22index d21c948..9e1969b 100755 22===================================================================
23--- a/src/tests/lxc-test-apparmor-mount 23--- lxc-4.0.9.orig/src/tests/lxc-test-apparmor-mount
24+++ b/src/tests/lxc-test-apparmor-mount 24+++ lxc-4.0.9/src/tests/lxc-test-apparmor-mount
25@@ -169,7 +169,7 @@ if [ -f /etc/lsb-release ]; then 25@@ -170,7 +170,7 @@
26 done 26 done
27 fi 27 fi
28 28
@@ -31,11 +31,11 @@ index d21c948..9e1969b 100755
31 31
32 echo "test default confined container" 32 echo "test default confined container"
33 run_cmd lxc-start -n $cname -d -lDEBUG -o "$logfile" 33 run_cmd lxc-start -n $cname -d -lDEBUG -o "$logfile"
34diff --git a/src/tests/lxc-test-autostart b/src/tests/lxc-test-autostart 34Index: lxc-4.0.9/src/tests/lxc-test-autostart
35index e5b651b..d15b79b 100755 35===================================================================
36--- a/src/tests/lxc-test-autostart 36--- lxc-4.0.9.orig/src/tests/lxc-test-autostart
37+++ b/src/tests/lxc-test-autostart 37+++ lxc-4.0.9/src/tests/lxc-test-autostart
38@@ -55,7 +55,7 @@ if [ -f /etc/lsb-release ]; then 38@@ -55,7 +55,7 @@
39 done 39 done
40 fi 40 fi
41 41
@@ -44,11 +44,11 @@ index e5b651b..d15b79b 100755
44 CONTAINER_PATH=$(dirname $(lxc-info -n $CONTAINER_NAME -c lxc.rootfs.path -H) | sed -e 's/dir://') 44 CONTAINER_PATH=$(dirname $(lxc-info -n $CONTAINER_NAME -c lxc.rootfs.path -H) | sed -e 's/dir://')
45 cp $CONTAINER_PATH/config $CONTAINER_PATH/config.bak 45 cp $CONTAINER_PATH/config $CONTAINER_PATH/config.bak
46 46
47diff --git a/src/tests/lxc-test-no-new-privs b/src/tests/lxc-test-no-new-privs 47Index: lxc-4.0.9/src/tests/lxc-test-no-new-privs
48index 8642992..e72bdf0 100755 48===================================================================
49--- a/src/tests/lxc-test-no-new-privs 49--- lxc-4.0.9.orig/src/tests/lxc-test-no-new-privs
50+++ b/src/tests/lxc-test-no-new-privs 50+++ lxc-4.0.9/src/tests/lxc-test-no-new-privs
51@@ -47,7 +47,7 @@ if type dpkg >/dev/null 2>&1; then 51@@ -49,7 +49,7 @@
52 ARCH=$(dpkg --print-architecture) 52 ARCH=$(dpkg --print-architecture)
53 fi 53 fi
54 54
@@ -57,24 +57,24 @@ index 8642992..e72bdf0 100755
57 echo "lxc.no_new_privs = 1" >> /var/lib/lxc/c1/config 57 echo "lxc.no_new_privs = 1" >> /var/lib/lxc/c1/config
58 58
59 lxc-start -n c1 59 lxc-start -n c1
60diff --git a/src/tests/lxc-test-unpriv b/src/tests/lxc-test-unpriv 60Index: lxc-4.0.9/src/tests/lxc-test-unpriv
61index 16ff12d..0958d48 100755 61===================================================================
62--- a/src/tests/lxc-test-unpriv 62--- lxc-4.0.9.orig/src/tests/lxc-test-unpriv
63+++ b/src/tests/lxc-test-unpriv 63+++ lxc-4.0.9/src/tests/lxc-test-unpriv
64@@ -173,7 +173,7 @@ run_cmd mkdir -p $HDIR/.cache/lxc 64@@ -178,7 +178,7 @@
65 cp -R /var/cache/lxc/download $HDIR/.cache/lxc && \ 65 cp -R /var/cache/lxc/download $HDIR/.cache/lxc && \
66 chown -R $TUSER: $HDIR/.cache/lxc 66 chown -R $TUSER: $HDIR/.cache/lxc
67 67
68-run_cmd lxc-create -t download -n c1 -- -d ubuntu -r $release -a $ARCH 68-run_cmd lxc-create -t download -n c1 -l trace -o "${UNPRIV_LOG}" -- -d ubuntu -r $release -a $ARCH
69+run_cmd lxc-create -t download -n c1 -- --no-validate -d ubuntu -r $release -a $ARCH 69+run_cmd lxc-create -t download -n c1 -l trace -o "${UNPRIV_LOG}" -- --no-validate -d ubuntu -r $release -a $ARCH
70 70
71 # Make sure we can start it - twice 71 # Make sure we can start it - twice
72 72
73diff --git a/src/tests/lxc-test-usernic.in b/src/tests/lxc-test-usernic.in 73Index: lxc-4.0.9/src/tests/lxc-test-usernic.in
74index 3e35008..f489286 100755 74===================================================================
75--- a/src/tests/lxc-test-usernic.in 75--- lxc-4.0.9.orig/src/tests/lxc-test-usernic.in
76+++ b/src/tests/lxc-test-usernic.in 76+++ lxc-4.0.9/src/tests/lxc-test-usernic.in
77@@ -146,7 +146,7 @@ if [ -f /etc/lsb-release ]; then 77@@ -147,7 +147,7 @@
78 fi 78 fi
79 79
80 # Create three containers 80 # Create three containers
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-31 11:19:16 +0000