From owner-svn-src-stable-10@freebsd.org Tue Jan 12 02:12:42 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0A00BA6DACE; Tue, 12 Jan 2016 02:12:42 +0000 (UTC) (envelope-from gjb@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 mx1.freebsd.org (Postfix) with ESMTPS id D89DB129F; Tue, 12 Jan 2016 02:12:41 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0C2Cekl089450; Tue, 12 Jan 2016 02:12:40 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0C2CeJf089446; Tue, 12 Jan 2016 02:12:40 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201601120212.u0C2CeJf089446@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 12 Jan 2016 02:12:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r293723 - in stable/10/release: amd64 i386 powerpc X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jan 2016 02:12:42 -0000 Author: gjb Date: Tue Jan 12 02:12:40 2016 New Revision: 293723 URL: https://svnweb.freebsd.org/changeset/base/293723 Log: MFC r293188: Prevent memstick installation medium from attempting to mount the root filesystem read-write. This causes problems booting the memstick installation medium from write-protected USB flash drives. PR: 187161, 205886 Sponsored by: The FreeBSD Foundation Modified: stable/10/release/amd64/make-memstick.sh stable/10/release/amd64/make-uefi-memstick.sh stable/10/release/i386/make-memstick.sh stable/10/release/powerpc/make-memstick.sh Directory Properties: stable/10/ (props changed) Modified: stable/10/release/amd64/make-memstick.sh ============================================================================== --- stable/10/release/amd64/make-memstick.sh Tue Jan 12 01:55:57 2016 (r293722) +++ stable/10/release/amd64/make-memstick.sh Tue Jan 12 02:12:40 2016 (r293723) @@ -29,12 +29,14 @@ if [ -e ${2} ]; then fi echo '/dev/ufs/FreeBSD_Install / ufs ro,noatime 1 1' > ${1}/etc/fstab +echo 'root_rw_mount="NO"' > ${1}/etc/rc.conf.local makefs -B little -o label=FreeBSD_Install ${2} ${1} if [ $? -ne 0 ]; then echo "makefs failed" exit 1 fi rm ${1}/etc/fstab +rm ${1}/etc/rc.conf.local unit=$(mdconfig -a -t vnode -f ${2}) if [ $? -ne 0 ]; then Modified: stable/10/release/amd64/make-uefi-memstick.sh ============================================================================== --- stable/10/release/amd64/make-uefi-memstick.sh Tue Jan 12 01:55:57 2016 (r293722) +++ stable/10/release/amd64/make-uefi-memstick.sh Tue Jan 12 02:12:40 2016 (r293723) @@ -29,12 +29,14 @@ if [ -e ${2} ]; then fi echo '/dev/ufs/FreeBSD_Install / ufs ro,noatime 1 1' > ${1}/etc/fstab +echo 'root_rw_mount="NO"' > ${1}/etc/rc.conf.local makefs -B little -o label=FreeBSD_Install ${2}.part ${1} if [ $? -ne 0 ]; then echo "makefs failed" exit 1 fi rm ${1}/etc/fstab +rm ${1}/etc/rc.conf.local mkimg -s gpt -b ${1}/boot/pmbr -p efi:=${1}/boot/boot1.efifat -p freebsd-boot:=${1}/boot/gptboot -p freebsd-ufs:=${2}.part -p freebsd-swap::1M -o ${2} rm ${2}.part Modified: stable/10/release/i386/make-memstick.sh ============================================================================== --- stable/10/release/i386/make-memstick.sh Tue Jan 12 01:55:57 2016 (r293722) +++ stable/10/release/i386/make-memstick.sh Tue Jan 12 02:12:40 2016 (r293723) @@ -29,12 +29,14 @@ if [ -e ${2} ]; then fi echo '/dev/ufs/FreeBSD_Install / ufs ro,noatime 1 1' > ${1}/etc/fstab +echo 'root_rw_mount="NO"' > ${1}/etc/rc.conf.local makefs -B little -o label=FreeBSD_Install ${2}.part ${1} if [ $? -ne 0 ]; then echo "makefs failed" exit 1 fi rm ${1}/etc/fstab +rm ${1}/etc/rc.conf.local mkimg -s gpt -b ${1}/boot/pmbr -p freebsd-boot:=${1}/boot/gptboot -p freebsd-ufs:=${2}.part -p freebsd-swap::1M -o ${2} rm ${2}.part Modified: stable/10/release/powerpc/make-memstick.sh ============================================================================== --- stable/10/release/powerpc/make-memstick.sh Tue Jan 12 01:55:57 2016 (r293722) +++ stable/10/release/powerpc/make-memstick.sh Tue Jan 12 02:12:40 2016 (r293723) @@ -33,6 +33,7 @@ if [ -e ${2} ]; then fi echo '/dev/da0s3 / ufs ro,noatime 1 1' > ${1}/etc/fstab +echo 'root_rw_mount="NO"' > ${1}/etc/rc.conf.local rm -f ${tempfile} makefs -B big ${tempfile} ${1} if [ $? -ne 0 ]; then @@ -40,6 +41,7 @@ if [ $? -ne 0 ]; then exit 1 fi rm ${1}/etc/fstab +rm ${1}/etc/rc.conf.local mkimg -s apm -p freebsd-boot:=${1}/boot/boot1.hfs -p freebsd-ufs/FreeBSD_Install:=${tempfile} -o ${2}