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

Revert r336240, which contained unrelated changes accidentally committed.

Browse Source
This commit is contained in:
Ian Lepore 2018-07-13 16:32:31 +00:00
parent 0d55ac1622
commit 7b4b55e520
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=336241
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,10 +48,7 @@ make_esp_mbr() {
s=$(find-part $dev "!239") s=$(find-part $dev "!239")
if [ -z "$s" ] ; then if [ -z "$s" ] ; then
s=$(find-part $dev "efi") die "No ESP slice found"
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}
} }
@ -152,7 +149,7 @@ boot_nogeli_mbr_zfs_legacy() {
} }
boot_nogeli_mbr_zfs_uefi() { boot_nogeli_mbr_zfs_uefi() {
make_esp_mbr $1 $2 make_eps_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=x passphrase=passphrase
iterations=5 iterations=50000
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 -net none" qser="-serial telnet::4444,server -nographic"
# https://wiki.freebsd.org/QemuRecipes # https://wiki.freebsd.org/QemuRecipes
# aarch64 # aarch64
@ -681,7 +681,6 @@ 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
@ -694,7 +693,6 @@ 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()
@ -703,7 +701,6 @@ 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()
@ -713,7 +710,6 @@ 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
@ -726,7 +722,6 @@ 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
@ -736,7 +731,6 @@ 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
@ -747,7 +741,6 @@ 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()