diff options
author | Ian Lepore <ian@FreeBSD.org> | 2018-07-13 16:30:54 +0000 |
---|---|---|
committer | Ian Lepore <ian@FreeBSD.org> | 2018-07-13 16:30:54 +0000 |
commit | 0d55ac162267bcf8801ee099b20a859402b1ca6d (patch) | |
tree | 1e56696b901fd708eef18c94868a573d911d9b4e /tools/boot/rootgen.sh | |
parent | 83f526de6ad3134ee468a577fc43f3396845d8b7 (diff) | |
download | src-0d55ac162267bcf8801ee099b20a859402b1ca6d.tar.gz src-0d55ac162267bcf8801ee099b20a859402b1ca6d.zip |
More little fixes... fix a function name typo (eps vs esp), and cope with
newer versions of gpart that show mbr efi partition types with the name
'efi' rather than as '!239'.
Notes
Notes:
svn path=/head/; revision=336240
Diffstat (limited to 'tools/boot/rootgen.sh')
-rwxr-xr-x | tools/boot/rootgen.sh | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/tools/boot/rootgen.sh b/tools/boot/rootgen.sh index eb7337ca208d..5424e21825bb 100755 --- a/tools/boot/rootgen.sh +++ b/tools/boot/rootgen.sh @@ -2,8 +2,8 @@ # $FreeBSD$ -passphrase=passphrase -iterations=50000 +passphrase=x +iterations=5 do_boot1_efi=0 @@ -668,7 +668,7 @@ EOF rm -f ${src}/etc/fstab } -qser="-serial telnet::4444,server -nographic" +qser="-serial telnet::4444,server -net none" # https://wiki.freebsd.org/QemuRecipes # aarch64 @@ -681,6 +681,7 @@ qemu_aarch64_uefi() -bios QEMU_EFI.fd ${qser} \ -drive if=none,file=${img},id=hd0 \ -device virtio-blk-device,drive=hd0" > $sh + chmod 755 $sh # https://wiki.freebsd.org/arm64/QEMU also has # -device virtio-net-device,netdev=net0 # -netdev user,id=net0 @@ -693,6 +694,7 @@ qemu_amd64_legacy() sh=$2 echo "qemu-system-x86_64 -m 256m --drive file=${img},format=raw ${qser}" > $sh + chmod 755 $sh } qemu_amd64_uefi() @@ -701,6 +703,7 @@ qemu_amd64_uefi() sh=$2 echo "qemu-system-x86_64 -m 256m -bios ~/bios/OVMF-X64.fd --drive file=${img},format=raw ${qser}" > $sh + chmod 755 $sh } qemu_amd64_both() @@ -710,6 +713,7 @@ qemu_amd64_both() echo "qemu-system-x86_64 -m 256m --drive file=${img},format=raw ${qser}" > $sh echo "qemu-system-x86_64 -m 256m -bios ~/bios/OVMF-X64.fd --drive file=${img},format=raw ${qser}" >> $sh + chmod 755 $sh } # arm @@ -722,6 +726,7 @@ qemu_i386_legacy() sh=$2 echo "qemu-system-i386 --drive file=${img},format=raw ${qser}" > $sh + chmod 755 $sh } # Not yet supported @@ -731,6 +736,7 @@ qemu_i386_uefi() sh=$2 echo "qemu-system-i386 -bios ~/bios/OVMF-X32.fd --drive file=${img},format=raw ${qser}" > $sh + chmod 755 $sh } # Needs UEFI to be supported @@ -741,6 +747,7 @@ qemu_i386_both() echo "qemu-system-i386 --drive file=${img},format=raw ${qser}" > $sh echo "qemu-system-i386 -bios ~/bios/OVMF-X32.fd --drive file=${img},format=raw ${qser}" >> $sh + chmod 755 $sh } make_one_image() |