From owner-svn-src-all@freebsd.org Fri Jul 13 16:32:33 2018 Return-Path: Delivered-To: svn-src-all@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 E06C210431D2; Fri, 13 Jul 2018 16:32:32 +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 959978D8DD; Fri, 13 Jul 2018 16:32:32 +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 768B912B5F; Fri, 13 Jul 2018 16:32:32 +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 w6DGWW5h083360; Fri, 13 Jul 2018 16:32:32 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6DGWW4w083358; Fri, 13 Jul 2018 16:32:32 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201807131632.w6DGWW4w083358@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:32:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336241 - head/tools/boot X-SVN-Group: head X-SVN-Commit-Author: ian X-SVN-Commit-Paths: head/tools/boot X-SVN-Commit-Revision: 336241 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2018 16:32:33 -0000 Author: ian Date: Fri Jul 13 16:32:31 2018 New Revision: 336241 URL: https://svnweb.freebsd.org/changeset/base/336241 Log: Revert r336240, which contained unrelated changes accidentally committed. 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 16:30:54 2018 (r336240) +++ head/tools/boot/install-boot.sh Fri Jul 13 16:32:31 2018 (r336241) @@ -48,10 +48,7 @@ make_esp_mbr() { s=$(find-part $dev "!239") if [ -z "$s" ] ; then - s=$(find-part $dev "efi") - if [ -z "$s" ] ; then - die "No ESP slice found" - fi + die "No ESP slice found" fi make_esp /dev/${dev}s${s} ${dst} } @@ -152,7 +149,7 @@ boot_nogeli_mbr_zfs_legacy() { } boot_nogeli_mbr_zfs_uefi() { - make_esp_mbr $1 $2 + make_eps_mbr $1 $2 } boot_nogeli_mbr_zfs_both() { Modified: head/tools/boot/rootgen.sh ============================================================================== --- head/tools/boot/rootgen.sh Fri Jul 13 16:30:54 2018 (r336240) +++ head/tools/boot/rootgen.sh Fri Jul 13 16:32:31 2018 (r336241) @@ -2,8 +2,8 @@ # $FreeBSD$ -passphrase=x -iterations=5 +passphrase=passphrase +iterations=50000 do_boot1_efi=0 @@ -668,7 +668,7 @@ EOF rm -f ${src}/etc/fstab } -qser="-serial telnet::4444,server -net none" +qser="-serial telnet::4444,server -nographic" # https://wiki.freebsd.org/QemuRecipes # aarch64 @@ -681,7 +681,6 @@ 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 @@ -694,7 +693,6 @@ 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() @@ -703,7 +701,6 @@ 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() @@ -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 -bios ~/bios/OVMF-X64.fd --drive file=${img},format=raw ${qser}" >> $sh - chmod 755 $sh } # arm @@ -726,7 +722,6 @@ qemu_i386_legacy() sh=$2 echo "qemu-system-i386 --drive file=${img},format=raw ${qser}" > $sh - chmod 755 $sh } # Not yet supported @@ -736,7 +731,6 @@ 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 @@ -747,7 +741,6 @@ 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()