From 5e1337c6558d5573f209a3198ffde197d7b3573d Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Mon, 16 Aug 2021 17:38:49 +0200 Subject: [PATCH] test: use busybox in lxc-test-apparmor-mount Signed-off-by: Christian Brauner --- src/tests/lxc-test-apparmor-mount | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/src/tests/lxc-test-apparmor-mount b/src/tests/lxc-test-apparmor-mount index 5b720d096..2ae3a2e6f 100755 --- a/src/tests/lxc-test-apparmor-mount +++ b/src/tests/lxc-test-apparmor-mount @@ -53,7 +53,6 @@ run_cmd() { } DONE=0 -KNOWN_RELEASES="precise trusty xenial yakkety zesty" MOUNTSR=/sys/kernel/security/apparmor/features/mount dnam=`mktemp -d` logfile=`mktemp` @@ -97,11 +96,6 @@ which newuidmap >/dev/null 2>&1 || { echo "'newuidmap' command is missing" >&2; TUSER=lxcunpriv HDIR=/home/$TUSER -ARCH=i386 -if type dpkg >/dev/null 2>&1; then - ARCH=$(dpkg --print-architecture) -fi - deluser $TUSER && rm -Rf $HDIR || true useradd $TUSER @@ -154,23 +148,7 @@ else fi -run_cmd mkdir -p $HDIR/.cache/lxc -[ -d /var/cache/lxc/download ] && \ - cp -R /var/cache/lxc/download $HDIR/.cache/lxc && \ - chown -R $TUSER: $HDIR/.cache/lxc - -# 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 - -run_cmd lxc-create -t download -n $cname -- -d ubuntu -r $release -a $ARCH +run_cmd lxc-create -t busybox -n $cname echo "test default confined container" run_cmd lxc-start -n $cname -d -lDEBUG -o "$logfile" -- 2.47.3