d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More little fixes... fix a function name typo (eps vs esp), and cope with

Browse Source 
newer versions of gpart that show mbr efi partition types with the name
'efi' rather than as '!239'.
This commit is contained in:
Ian Lepore 2018-07-13 16:30:54 +00:00
parent 83f526de6a
commit 0d55ac1622
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=336240
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/boot/install-boot.sh
View File

@ -48,7 +48,10 @@ make_esp_mbr() {
s=$(find-part $dev "!239") s=$(find-part $dev "!239")
if [ -z "$s" ] ; then if [ -z "$s" ] ; then
die "No ESP slice found" s=$(find-part $dev "efi")
if [ -z "$s" ] ; then
die "No ESP slice found"
fi
fi fi
make_esp /dev/${dev}s${s} ${dst} make_esp /dev/${dev}s${s} ${dst}
} }
@ -149,7 +152,7 @@ boot_nogeli_mbr_zfs_legacy() {
} }
boot_nogeli_mbr_zfs_uefi() { boot_nogeli_mbr_zfs_uefi() {
make_eps_mbr $1 $2 make_esp_mbr $1 $2
} }
boot_nogeli_mbr_zfs_both() { boot_nogeli_mbr_zfs_both() {

13
tools/boot/rootgen.sh
View File

@ -2,8 +2,8 @@
# $FreeBSD$ # $FreeBSD$
passphrase=passphrase passphrase=x
iterations=50000 iterations=5
do_boot1_efi=0 do_boot1_efi=0
@ -668,7 +668,7 @@ EOF
rm -f ${src}/etc/fstab rm -f ${src}/etc/fstab
} }
qser="-serial telnet::4444,server -nographic" qser="-serial telnet::4444,server -net none"
# https://wiki.freebsd.org/QemuRecipes # https://wiki.freebsd.org/QemuRecipes
# aarch64 # aarch64
@ -681,6 +681,7 @@ qemu_aarch64_uefi()
-bios QEMU_EFI.fd ${qser} \ -bios QEMU_EFI.fd ${qser} \
-drive if=none,file=${img},id=hd0 \ -drive if=none,file=${img},id=hd0 \
-device virtio-blk-device,drive=hd0" > $sh -device virtio-blk-device,drive=hd0" > $sh
chmod 755 $sh
# https://wiki.freebsd.org/arm64/QEMU also has # https://wiki.freebsd.org/arm64/QEMU also has
# -device virtio-net-device,netdev=net0 # -device virtio-net-device,netdev=net0
# -netdev user,id=net0 # -netdev user,id=net0
@ -693,6 +694,7 @@ qemu_amd64_legacy()
sh=$2 sh=$2
echo "qemu-system-x86_64 -m 256m --drive file=${img},format=raw ${qser}" > $sh echo "qemu-system-x86_64 -m 256m --drive file=${img},format=raw ${qser}" > $sh
chmod 755 $sh
} }
qemu_amd64_uefi() qemu_amd64_uefi()
@ -701,6 +703,7 @@ qemu_amd64_uefi()
sh=$2 sh=$2
echo "qemu-system-x86_64 -m 256m -bios ~/bios/OVMF-X64.fd --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
} }
qemu_amd64_both() 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 --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 echo "qemu-system-x86_64 -m 256m -bios ~/bios/OVMF-X64.fd --drive file=${img},format=raw ${qser}" >> $sh
chmod 755 $sh
} }
# arm # arm
@ -722,6 +726,7 @@ qemu_i386_legacy()
sh=$2 sh=$2
echo "qemu-system-i386 --drive file=${img},format=raw ${qser}" > $sh echo "qemu-system-i386 --drive file=${img},format=raw ${qser}" > $sh
chmod 755 $sh
} }
# Not yet supported # Not yet supported
@ -731,6 +736,7 @@ qemu_i386_uefi()
sh=$2 sh=$2
echo "qemu-system-i386 -bios ~/bios/OVMF-X32.fd --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
} }
# Needs UEFI to be supported # 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 --drive file=${img},format=raw ${qser}" > $sh
echo "qemu-system-i386 -bios ~/bios/OVMF-X32.fd --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() make_one_image()