diff options
| -rwxr-xr-x | debvm-create | 2 | ||||
| -rwxr-xr-x | tests/create-and-run.sh | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/debvm-create b/debvm-create index b39330b..3e25578 100755 --- a/debvm-create +++ b/debvm-create @@ -302,7 +302,7 @@ if test -n "$SSHKEY"; then "$@" fi -set -- --skip=cleanup/apt "$@" +set -- --skip=cleanup/apt/lists "$@" # We need /var/lib/dpkg/available for dpkg --set-selections to work. set -- '--customize-hook=chroot "$1" apt-cache dumpavail | chroot "$1" dpkg --update-avail' "$@" diff --git a/tests/create-and-run.sh b/tests/create-and-run.sh index 0e2a3ca..aafd41d 100755 --- a/tests/create-and-run.sh +++ b/tests/create-and-run.sh @@ -20,7 +20,7 @@ debvm-create -k ssh_id.pub -o test.ext4 -a "$1" -r "$2" timeout 240s debvm-run -s 2222 -i test.ext4 & timeout=5 -sshopt="-o StrictHostKeyChecking=no $(if test "$2" = jessie; then echo -o PubkeyAcceptedKeyTypes=+ssh-rsa; fi)" +sshopt="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null $(if test "$2" = jessie; then echo -o PubkeyAcceptedKeyTypes=+ssh-rsa; fi)" ts=$(sleepenh 0 || [ $? -eq 1 ]) for i in $(seq 30); do rv=0 @@ -33,3 +33,4 @@ for i in $(seq 30); do fi done ssh $sshopt -i ssh_id -p 2222 root@localhost poweroff +wait |