From acd792c965b23753cb31336f153fec196a88c531 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Mon, 16 Aug 2021 17:33:59 +0200 Subject: [PATCH] test: use busybox in lxc-test-apparmor-generated Signed-off-by: Christian Brauner --- src/tests/lxc-test-apparmor-generated | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/src/tests/lxc-test-apparmor-generated b/src/tests/lxc-test-apparmor-generated index be2e32619..25057e0c8 100755 --- a/src/tests/lxc-test-apparmor-generated +++ b/src/tests/lxc-test-apparmor-generated @@ -24,7 +24,6 @@ fi exit 0 DONE=0 -KNOWN_RELEASES="precise trusty xenial yakkety zesty" LOGFILE="/tmp/lxc-test-$$.log" cleanup() { lxc-destroy -n $CONTAINER_NAME >/dev/null 2>&1 || true @@ -39,29 +38,13 @@ cleanup() { echo "PASS" } -ARCH=i386 -if type dpkg >/dev/null 2>&1; then - ARCH=$(dpkg --print-architecture) -fi - trap cleanup EXIT HUP INT TERM set -eu # Create a container CONTAINER_NAME=lxc-test-apparmor-generated -# default release is trusty, or the systems release if recognized -release=trusty -if [ -f /etc/lsb-release ]; then - . /etc/lsb-release - rels=$(ubuntu-distro-info --supported 2>/dev/null) || - rels="$KNOWN_RELEASES" - for r in $rels; do - [ "$DISTRIB_CODENAME" = "$r" ] && release="$r" - done -fi - -lxc-create -t download -n $CONTAINER_NAME -B dir -- -d ubuntu -r $release -a $ARCH +lxc-create -t busybox -n $CONTAINER_NAME -B dir CONTAINER_PATH=$(dirname $(lxc-info -n $CONTAINER_NAME -c lxc.rootfs.path -H) | sed -e 's/dir://') cp $CONTAINER_PATH/config $CONTAINER_PATH/config.bak -- 2.47.2