X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=vmdebdev;h=615e88f4280fbd1cade07292bb277afb7639ecc7;hp=33efdf78230b59fc139453702d66d8867ff94806;hb=b83c86dcd16b89efa0df6654dcbe78d67ee221af;hpb=85cfb84505bf498b1c970dd4fc8df3105f941299

diff --git a/vmdebdev b/vmdebdev
index 33efdf7..615e88f 100755
--- a/vmdebdev
+++ b/vmdebdev
@@ -10,7 +10,8 @@ set timeout 60
 # Start the guest VM
 set img [lrange $argv 0 0]
 if { $img == "" } { set img "/srv/vm/autopkgtest-sid.img" }
-spawn vm $img -nographic -snapshot -virtfs local,id=srv,path=/srv,security_model=none,mount_tag=srv,readonly \
+spawn vm $img -nographic -snapshot -cpu host -smp 3 \
+              -virtfs local,id=srv,path=/srv,security_model=none,mount_tag=srv,readonly \
               -virtfs local,id=etcschroot,path=/etc/schroot,security_model=none,mount_tag=etcschroot,readonly
 
 # Login, and get root shell
@@ -32,7 +33,7 @@ send "export TERM=xterm; $getroot\r"
 expect -re $prompt
 
 # install wanted packages; openssh postinst does funny things to the terminal, so only give it pipes
-send "DEBIAN_FRONTEND=noninteractive apt-get install -o Dpkg::Options::=--force-confnew -y git-buildpackage libwww-perl less vim lintian debhelper manpages-dev git dput pristine-tar bash-completion libnss-myhostname lptools python-keyrings.alt wget gnupg2 ubuntu-dev-tools python3-debian qemu-kvm qemu-utils schroot sbuild locales openssh-server </dev/null 2>&1 | cat\r"
+send "DEBIAN_FRONTEND=noninteractive apt-get install -o Dpkg::Options::=--force-confnew -y git-buildpackage libwww-perl less vim lintian build-essential debhelper manpages-dev git dput pristine-tar bash-completion libnss-myhostname lptools python-keyrings.alt wget gnupg2 ubuntu-dev-tools python3-debian qemu-kvm qemu-utils schroot sbuild locales openssh-server </dev/null 2>&1 | cat\r"
 expect -re $prompt
 
 # set up user
@@ -51,8 +52,8 @@ send "(cd /home/martin; ln -s h/.gbp.conf; ln -s h/.vimrc)\r"
 expect -re $prompt
 
 #
-## set up lxd if available (on Ubuntu)
-send "(apt-get install -y lxd </dev/null && adduser martin lxd && yes '' | lxd init || true) 2>&1 | cat\r"
+## install lxd if available (on Ubuntu)
+send "(apt-get install -y lxd </dev/null && adduser martin lxd) 2>&1 | cat\r"
 expect -re $prompt
 
 interact