diff options
| author | Sven-Hendrik Haase <svenstaro@gmail.com> | 2021-02-25 20:34:05 +0000 |
|---|---|---|
| committer | Sven-Hendrik Haase <svenstaro@gmail.com> | 2021-02-25 20:34:05 +0000 |
| commit | 05aeccd515bc79d1ba2f1355fc9d844429526708 (patch) | |
| tree | 5935e987df2d42d7031f02437fba977002decf8a | |
| parent | 5ac84f226416b875cbdb67d45d759cb6fe5e3237 (diff) | |
| parent | 0ed6dbb61f77082bcec0cb4741c441f6625db73f (diff) | |
Merge branch 'partial-upgrade' into 'master'
Fix partial upgrade in the guest
Closes #136
See merge request archlinux/arch-boxes!164
| -rwxr-xr-x | build-host.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build-host.sh b/build-host.sh index 712cc1f..851b299 100755 --- a/build-host.sh +++ b/build-host.sh @@ -54,12 +54,12 @@ function start_qemu() { { qemu-system-x86_64 \ -machine accel=kvm:tcg \ -smp 4 \ - -m 1024 \ + -m 2048 \ -net nic \ -net user \ -kernel vmlinuz-linux \ -initrd initramfs-linux.img \ - -append "archisobasedir=arch archisolabel=${ISO_VOLUME_ID} ip=dhcp net.ifnames=0 console=ttyS0 mirror=${MIRROR}" \ + -append "archisobasedir=arch archisolabel=${ISO_VOLUME_ID} cow_spacesize=2G ip=dhcp net.ifnames=0 console=ttyS0 mirror=${MIRROR}" \ -drive file=scratch-disk.img,format=raw,if=virtio \ -drive file="${ISO}",format=raw,if=virtio,media=cdrom,read-only \ -virtfs "local,path=${ORIG_PWD},mount_tag=host,security_model=none" \ @@ -132,8 +132,8 @@ function main() { expect "# " # Install required packages - send "pacman -Sy --noconfirm qemu-headless jq\n" - expect "# " + send "pacman -Syu --ignore linux --noconfirm qemu-headless jq\n" + expect "# " 120 # (10/14) Updating module dependencies... ## Start build and copy output to local disk send "bash -x ./build-inside-vm.sh ${BUILD_VERSION:-}\n" |