test: fix tests

parent 4d463f62
......@@ -55,8 +55,8 @@ if [ -f /etc/lsb-release ]; then
done
fi
lxc-create -t download -n $CONTAINER_NAME -- -d ubuntu -r $release -a $ARCH
CONTAINER_PATH=$(dirname $(lxc-info -n $CONTAINER_NAME -c lxc.rootfs -H))
lxc-create -t download -n $CONTAINER_NAME -B dir -- -d ubuntu -r $release -a $ARCH
CONTAINER_PATH=$(dirname $(lxc-info -n $CONTAINER_NAME -c lxc.rootfs -H) | sed -e 's/dir://')
cp $CONTAINER_PATH/config $CONTAINER_PATH/config.bak
# Ensure it's not in lxc-autostart
......
......@@ -108,8 +108,8 @@ EOF
# Figure out container dirname
# We need this in 5.conf
lxc-destroy -n lxctestb || true
lxc-create -t busybox -n lxctestb
CONTAINER_PATH=$(dirname $(lxc-info -n lxctestb -c lxc.rootfs -H))
lxc-create -t busybox -n lxctestb -B dir
CONTAINER_PATH=$(dirname $(lxc-info -n lxctestb -c lxc.rootfs -H) | sed 's/dir://')
lxc-destroy -n lxctestb
# No nics, one clone hook in $container
......
......@@ -524,13 +524,6 @@ int main(int argc, char *argv[])
goto non_test_error;
}
/* lxc.rootfs.backend */
if (set_get_compare_clear_save_load(c, "lxc.rootfs.backend", "btrfs",
tmpf, true) < 0) {
lxc_error("%s\n", "lxc.rootfs.backend");
goto non_test_error;
}
/* REMOVE IN LXC 3.0
legacy lxc.utsname key
*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment