Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
juadde
arch-boxes
Commits
05aeccd5
Commit
05aeccd5
authored
Feb 25, 2021
by
Sven-Hendrik Haase
Browse files
Merge branch 'partial-upgrade' into 'master'
Fix partial upgrade in the guest Closes
#136
See merge request
!164
parents
5ac84f22
0ed6dbb6
Changes
1
Hide whitespace changes
Inline
Side-by-side
build-host.sh
View file @
05aeccd5
...
@@ -54,12 +54,12 @@ function start_qemu() {
...
@@ -54,12 +54,12 @@ function start_qemu() {
{
qemu-system-x86_64
\
{
qemu-system-x86_64
\
-machine
accel
=
kvm:tcg
\
-machine
accel
=
kvm:tcg
\
-smp
4
\
-smp
4
\
-m
1024
\
-m
2048
\
-net
nic
\
-net
nic
\
-net
user
\
-net
user
\
-kernel
vmlinuz-linux
\
-kernel
vmlinuz-linux
\
-initrd
initramfs-linux.img
\
-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
=
scratch-disk.img,format
=
raw,if
=
virtio
\
-drive
file
=
"
${
ISO
}
"
,format
=
raw,if
=
virtio,media
=
cdrom,read-only
\
-drive
file
=
"
${
ISO
}
"
,format
=
raw,if
=
virtio,media
=
cdrom,read-only
\
-virtfs
"local,path=
${
ORIG_PWD
}
,mount_tag=host,security_model=none"
\
-virtfs
"local,path=
${
ORIG_PWD
}
,mount_tag=host,security_model=none"
\
...
@@ -132,8 +132,8 @@ function main() {
...
@@ -132,8 +132,8 @@ function main() {
expect "# "
expect "# "
# Install required packages
# Install required packages
send "pacman -Sy --noconfirm qemu-headless jq\n"
send "pacman -Sy
u --ignore linux
--noconfirm qemu-headless jq\n"
expect "# "
expect "# "
120 # (10/14) Updating module dependencies...
## Start build and copy output to local disk
## Start build and copy output to local disk
send "bash -x ./build-inside-vm.sh ${BUILD_VERSION:-}\n"
send "bash -x ./build-inside-vm.sh ${BUILD_VERSION:-}\n"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment