diff options
author | David P <megver83@parabola.nu> | 2021-06-30 16:22:12 -0400 |
---|---|---|
committer | David P <megver83@parabola.nu> | 2021-07-05 16:57:40 -0400 |
commit | 47dd6e46e5bb03f6968d5f34e12434d0007c702e (patch) | |
tree | 2a60c531abd6af414796cbc899a54290862269b0 /scripts | |
parent | 79b988553b2707aed9fba21dd53033a7a011af6f (diff) |
sync with archiso v54v54
Imported changes:
28ab118 (tag: v54) Add changelog for v54
9827cb1 ci: Use environment variables to override build settings
cde7296 ci: Consolidate build-host script
8e44a8b ci: consolidate build script
d0d4fa5 configs/releng/airootfs/etc/systemd/system/pacman-init.service: don't hardcode the keyrings
3678bba configs/releng/packages.x86_64: explicitly add wanted packages instead of relying on pulling them in as dependencies
bd2b861 configs/*: add VM guest packages and enable their services
f86cb0f ci: Expand parallel matrix with build modes
5630a23 ci: build based on buildmodes
6b11d7b mkarchiso: Also create package list for netboot
ace88aa Update project documentation related to netboot
4d1e898 docs: Add netboot to buildmodes documentation
d54bf63 mkarchiso: Add buildmode to export netboot artifacts
1fed84c Extend project overview with info on bootstrap images
1630d76 docs: Add documentation for buildmodes and bootstrap build mode
2cac539 mkarchiso: Implement buildmodes that allow building bootstrap images
535bc3c baseline: Add bootstrap packages file
b7fd696 baseline: Add buildmodes to profiledef.sh
6afa695 releng: Add buildmodes to profiledef.sh
9c84b7c releng: Add packages file for bootstrap image
2a07aa2 Increase timeout for initial prompt in build VM
4b14350 Use QEMU 6.x options
c58b44f Use QEMU 6.x options
Parabola changes:
* add dual architecture support for bootstrap buildmode by creating two separated tarballs
* sync openrc profiles with releng updates
* disable haveged initscript since we removed it from the packages list
* add speakup_soft kernel module in openrc profiles to make espeakup work
TODO:
* add braille support for GUI lxde-openrc (w/orca?)
NOTE: We don't have/use CI (Arch uses GitLab), so we don't import those changes
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/run_parabolaiso.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/run_parabolaiso.sh b/scripts/run_parabolaiso.sh index 63f6c86..ca8b4c0 100755 --- a/scripts/run_parabolaiso.sh +++ b/scripts/run_parabolaiso.sh @@ -4,7 +4,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later # -# A simple script to run an parabolaiso image using qemu. The image can be booted +# A simple script to run a parabolaiso image using qemu. The image can be booted # using BIOS or UEFI. # # Requirements: @@ -73,7 +73,7 @@ run_image() { local ovmf_code='/usr/share/edk2-ovmf/x64/OVMF_CODE.fd' fi qemu_options+=( - '-drive' "if=pflash,format=raw,unit=0,file=${ovmf_code},readonly" + '-drive' "if=pflash,format=raw,unit=0,file=${ovmf_code},read-only=on" '-drive' "if=pflash,format=raw,unit=1,file=${working_dir}/OVMF_VARS.fd" '-global' "driver=cfi.pflash01,property=secure,value=${secure_boot}" ) @@ -89,7 +89,7 @@ run_image() { if [[ -n "${oddimage}" ]]; then qemu_options+=( '-device' 'scsi-cd,bus=scsi0.0,drive=cdrom1' - '-drive' "id=cdrom1,if=none,format=raw,media=cdrom,readonly=on,file=${oddimage}" + '-drive' "id=cdrom1,if=none,format=raw,media=cdrom,read-only=on,file=${oddimage}" ) fi @@ -100,7 +100,7 @@ run_image() { -name parabolaiso,process=parabolaiso_0 \ -device virtio-scsi-pci,id=scsi0 \ -device "scsi-${mediatype%rom},bus=scsi0.0,drive=${mediatype}0" \ - -drive "id=${mediatype}0,if=none,format=raw,media=${mediatype/hd/disk},readonly=on,file=${image}" \ + -drive "id=${mediatype}0,if=none,format=raw,media=${mediatype/hd/disk},read-only=on,file=${image}" \ -display "${display}" \ -vga virtio \ -audiodev pa,id=snd0 \ |