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}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
