svn commit: r293188 - in head/release: amd64 arm64 i386 powerpc
Glen Barber
gjb at FreeBSD.org
Tue Jan 5 03:20:47 UTC 2016
Author: gjb
Date: Tue Jan 5 03:20:45 2016
New Revision: 293188
URL: https://svnweb.freebsd.org/changeset/base/293188
Log:
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.
Submitted by: A.J. Kehoe IV [1], Oliver Jones [2]
PR: 187161 [1], 205886 [2]
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Modified:
head/release/amd64/make-memstick.sh
head/release/arm64/make-memstick.sh
head/release/i386/make-memstick.sh
head/release/powerpc/make-memstick.sh
Modified: head/release/amd64/make-memstick.sh
==============================================================================
--- head/release/amd64/make-memstick.sh Tue Jan 5 02:21:57 2016 (r293187)
+++ head/release/amd64/make-memstick.sh Tue Jan 5 03:20:45 2016 (r293188)
@@ -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: head/release/arm64/make-memstick.sh
==============================================================================
--- head/release/arm64/make-memstick.sh Tue Jan 5 02:21:57 2016 (r293187)
+++ head/release/arm64/make-memstick.sh Tue Jan 5 03:20:45 2016 (r293188)
@@ -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 mbr -p efi:=${1}/boot/boot1.efifat -p freebsd:=${2}.part -o ${2}
rm ${2}.part
Modified: head/release/i386/make-memstick.sh
==============================================================================
--- head/release/i386/make-memstick.sh Tue Jan 5 02:21:57 2016 (r293187)
+++ head/release/i386/make-memstick.sh Tue Jan 5 03:20:45 2016 (r293188)
@@ -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: head/release/powerpc/make-memstick.sh
==============================================================================
--- head/release/powerpc/make-memstick.sh Tue Jan 5 02:21:57 2016 (r293187)
+++ head/release/powerpc/make-memstick.sh Tue Jan 5 03:20:45 2016 (r293188)
@@ -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}
More information about the svn-src-all
mailing list