From owner-svn-src-head@freebsd.org Fri Jul 13 16:30:55 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B98461042FE1; Fri, 13 Jul 2018 16:30:55 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6B1CA8D651; Fri, 13 Jul 2018 16:30:55 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4C4B4129E7; Fri, 13 Jul 2018 16:30:55 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6DGUtT9078771; Fri, 13 Jul 2018 16:30:55 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6DGUskw078769; Fri, 13 Jul 2018 16:30:54 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201807131630.w6DGUskw078769@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Fri, 13 Jul 2018 16:30:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336240 - head/tools/boot X-SVN-Group: head X-SVN-Commit-Author: ian X-SVN-Commit-Paths: head/tools/boot X-SVN-Commit-Revision: 336240 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2018 16:30:56 -0000 Author: ian Date: Fri Jul 13 16:30:54 2018 New Revision: 336240 URL: https://svnweb.freebsd.org/changeset/base/336240 Log: 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'. Modified: head/tools/boot/install-boot.sh head/tools/boot/rootgen.sh Modified: head/tools/boot/install-boot.sh ============================================================================== --- head/tools/boot/install-boot.sh Fri Jul 13 12:39:27 2018 (r336239) +++ head/tools/boot/install-boot.sh Fri Jul 13 16:30:54 2018 (r336240) @@ -48,7 +48,10 @@ make_esp_mbr() { s=$(find-part $dev "!239") 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 make_esp /dev/${dev}s${s} ${dst} } @@ -149,7 +152,7 @@ boot_nogeli_mbr_zfs_legacy() { } boot_nogeli_mbr_zfs_uefi() { - make_eps_mbr $1 $2 + make_esp_mbr $1 $2 } boot_nogeli_mbr_zfs_both() { Modified: head/tools/boot/rootgen.sh ============================================================================== --- head/tools/boot/rootgen.sh Fri Jul 13 12:39:27 2018 (r336239) +++ head/tools/boot/rootgen.sh Fri Jul 13 16:30:54 2018 (r336240) @@ -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()