kloenk/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Get Ubuntu 22.10 to work

Browse source
This commit is contained in:
Eelco Dolstra 2022-09-14 19:44:41 +02:00
parent 906c947ee8
commit cc6e312315
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
tests/installer/default.nix
View file

@ -85,6 +85,8 @@ let
binaryTarball = binaryTarballs.${system}; binaryTarball = binaryTarballs.${system};
} }
'' ''
shopt -s nullglob
echo "Unpacking Vagrant box $image..." echo "Unpacking Vagrant box $image..."
tar xvf $image tar xvf $image
@ -92,10 +94,19 @@ let
qemu-img create -b ./${image.rootDisk} -F "$image_type" -f qcow2 ./disk.qcow2 qemu-img create -b ./${image.rootDisk} -F "$image_type" -f qcow2 ./disk.qcow2
extra_qemu_opts=
# Add the config disk, required by the Ubuntu images.
config_drive=$(echo *configdrive.vmdk || true)
if [[ -n $config_drive ]]; then
extra_qemu_opts+=" -drive id=disk2,file=$config_drive,if=virtio"
fi
echo "Starting qemu..." echo "Starting qemu..."
qemu-kvm -m 4096 -nographic \ qemu-kvm -m 4096 -nographic \
-drive id=disk1,file=./disk.qcow2,if=virtio \ -drive id=disk1,file=./disk.qcow2,if=virtio \
-netdev user,id=net0,restrict=yes,hostfwd=tcp::20022-:22 -device virtio-net-pci,netdev=net0 & -netdev user,id=net0,restrict=yes,hostfwd=tcp::20022-:22 -device virtio-net-pci,netdev=net0 \
$extra_qemu_opts &
qemu_pid=$! qemu_pid=$!
trap "kill $qemu_pid" EXIT trap "kill $qemu_pid" EXIT
@ -137,7 +148,13 @@ let
# FIXME: should update ~/.bashrc. # FIXME: should update ~/.bashrc.
$ssh " $ssh "
set -ex set -ex
source ~/.bash_profile || source ~/.bash_login || source ~/.profile || true
# FIXME: get rid of this; ideally ssh should just work.
source ~/.bash_profile || true
source ~/.bash_login || true
source ~/.profile || true
source /etc/bashrc || true
nix-env --version nix-env --version
nix --extra-experimental-features nix-command store ping nix --extra-experimental-features nix-command store ping
" "
@ -151,7 +168,8 @@ in
{ {
ubuntu-14-04.install-default = makeTest "ubuntu-14-04" "install-default"; ubuntu-14-04.install-default = makeTest "ubuntu-14-04" "install-default";
#ubuntu-16-04.install-default = makeTest "ubuntu-16-04" "install-default"; #ubuntu-16-04.install-default = makeTest "ubuntu-16-04" "install-default";
#ubuntu-22-10.install-default = makeTest "ubuntu-22-10" "install-default"; ubuntu-22-10.install-default = makeTest "ubuntu-22-10" "install-default";
ubuntu-22-10.install-force-daemon = makeTest "ubuntu-22-10" "install-force-daemon";
fedora-36.install-default = makeTest "fedora-36" "install-default"; fedora-36.install-default = makeTest "fedora-36" "install-default";
fedora-36.install-force-daemon = makeTest "fedora-36" "install-force-daemon"; fedora-36.install-force-daemon = makeTest "fedora-36" "install-force-daemon";
} }