[arch-releng] [PATCH 1/2] testiso: remove booting from scsi as this is not supported by our qemu package
Signed-off-by: Pierre Schmitz <pierre@archlinux.de> --- archiso/testiso | 16 ++++++---------- 1 Datei geändert, 6 Zeilen hinzugefügt(+), 10 Zeilen entfernt(-) diff --git a/archiso/testiso b/archiso/testiso index 71e85e1..7a4d5f1 100755 --- a/archiso/testiso +++ b/archiso/testiso @@ -1,26 +1,22 @@ #!/bin/bash if [[ $# -eq 0 ]]; then - echo "usage: testiso <isofile> [id|ic|sd|sc|vd|vc]" + echo "usage: testiso <isofile> [id|ic|vd|vc]" echo echo "id boot .iso as IDE disk" echo "ic boot .iso as IDE cd-rom" - echo "sd boot .iso as SCSI disk" - echo "sc boot .iso as SCSI cd-rom" echo "vd boot .iso as virtio disk" -# echo "vc boot .iso as virtio cd-rom" + echo "vc boot .iso as virtio cd-rom" exit 1 fi case "${2}" in id) IF="ide"; MEDIA="disk";; ic) IF="ide"; MEDIA="cdrom";; - sd) IF="scsi"; MEDIA="disk";; - sc) IF="scsi"; MEDIA="cdrom";; vd) IF="virtio"; MEDIA="disk";; -# vc) IF="virtio"; MEDIA="cdrom";; - *) IF="scsi"; MEDIA="cdrom";; + vc) IF="virtio"; MEDIA="cdrom";; + *) IF="ide"; MEDIA="cdrom";; esac -echo qemu-system-x86_64 -m 256 -drive file=${1},if=${IF},media=${MEDIA},boot=on -qemu-system-x86_64 -m 256 -drive file=${1},if=${IF},media=${MEDIA},boot=on +echo qemu-system-x86_64 -m 256 -drive file=${1},if=${IF},media=${MEDIA} +qemu-system-x86_64 -m 256 -drive file=${1},if=${IF},media=${MEDIA} -- 1.7.11
256MB is too low to test e.g. package installation. Signed-off-by: Pierre Schmitz <pierre@archlinux.de> --- archiso/testiso | 4 ++-- 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) diff --git a/archiso/testiso b/archiso/testiso index 7a4d5f1..d4a7a52 100755 --- a/archiso/testiso +++ b/archiso/testiso @@ -18,5 +18,5 @@ case "${2}" in *) IF="ide"; MEDIA="cdrom";; esac -echo qemu-system-x86_64 -m 256 -drive file=${1},if=${IF},media=${MEDIA} -qemu-system-x86_64 -m 256 -drive file=${1},if=${IF},media=${MEDIA} +echo qemu-system-x86_64 -m 512 -drive file=${1},if=${IF},media=${MEDIA} +qemu-system-x86_64 -m 512 -drive file=${1},if=${IF},media=${MEDIA} -- 1.7.11
On 06/25/2012 08:13 AM, Pierre Schmitz wrote:
Signed-off-by: Pierre Schmitz <pierre@archlinux.de> --- archiso/testiso | 16 ++++++---------- 1 Datei geändert, 6 Zeilen hinzugefügt(+), 10 Zeilen entfernt(-)
diff --git a/archiso/testiso b/archiso/testiso index 71e85e1..7a4d5f1 100755 --- a/archiso/testiso +++ b/archiso/testiso @@ -1,26 +1,22 @@ #!/bin/bash
if [[ $# -eq 0 ]]; then - echo "usage: testiso <isofile> [id|ic|sd|sc|vd|vc]" + echo "usage: testiso <isofile> [id|ic|vd|vc]" echo echo "id boot .iso as IDE disk" echo "ic boot .iso as IDE cd-rom" - echo "sd boot .iso as SCSI disk" - echo "sc boot .iso as SCSI cd-rom" I can not find the email now, but support for SCSI boot will be re-added in some way. (SCSI code was removed from BIOS at some point) echo "vd boot .iso as virtio disk" -# echo "vc boot .iso as virtio cd-rom" + echo "vc boot .iso as virtio cd-rom" what you get here is _still_ a virtio-blk boot. exit 1 fi
case "${2}" in id) IF="ide"; MEDIA="disk";; ic) IF="ide"; MEDIA="cdrom";; - sd) IF="scsi"; MEDIA="disk";; - sc) IF="scsi"; MEDIA="cdrom";; vd) IF="virtio"; MEDIA="disk";; -# vc) IF="virtio"; MEDIA="cdrom";; - *) IF="scsi"; MEDIA="cdrom";; + vc) IF="virtio"; MEDIA="cdrom";; + *) IF="ide"; MEDIA="cdrom";; esac
-echo qemu-system-x86_64 -m 256 -drive file=${1},if=${IF},media=${MEDIA},boot=on -qemu-system-x86_64 -m 256 -drive file=${1},if=${IF},media=${MEDIA},boot=on +echo qemu-system-x86_64 -m 256 -drive file=${1},if=${IF},media=${MEDIA} +qemu-system-x86_64 -m 256 -drive file=${1},if=${IF},media=${MEDIA}
Personally I never used this script, since I test in a many ways from qemu, using other consoles like serial. I like to remove this script at all. -- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1
Am 25.06.2012 16:55, schrieb Gerardo Exequiel Pozzi:
Personally I never used this script, since I test in a many ways from qemu, using other consoles like serial. I like to remove this script at all.
I am fine with removing those. -- Pierre Schmitz, https://pierre-schmitz.com
Am 21.07.2012 00:03, schrieb Pierre Schmitz:
Am 25.06.2012 16:55, schrieb Gerardo Exequiel Pozzi:
Personally I never used this script, since I test in a many ways from qemu, using other consoles like serial. I like to remove this script at all.
I am fine with removing those.
Seems you forgot to remove the testiso install from the Makefile. -- Pierre Schmitz, https://pierre-schmitz.com
On 07/23/2012 04:10 AM, Pierre Schmitz wrote:
Am 21.07.2012 00:03, schrieb Pierre Schmitz:
Am 25.06.2012 16:55, schrieb Gerardo Exequiel Pozzi:
Personally I never used this script, since I test in a many ways from qemu, using other consoles like serial. I like to remove this script at all. I am fine with removing those. Seems you forgot to remove the testiso install from the Makefile.
Thanks, fixed ;) -- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1
participants (2)
-
Gerardo Exequiel Pozzi
-
Pierre Schmitz