svn commit: r318652 - stable/11/etc
Glen Barber
gjb at FreeBSD.org
Mon May 22 16:07:19 UTC 2017
Author: gjb
Date: Mon May 22 16:07:17 2017
New Revision: 318652
URL: https://svnweb.freebsd.org/changeset/base/318652
Log:
MFC r307469 (imp):
Allow root_rw_mount to be both lower and upper case. Before, if it was
upper case, you'd wind up with a read-only filesystem when you should
sometimes.
PR: 213549
Sponsored by: The FreeBSD Foundation
Modified:
stable/11/etc/rc
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/etc/rc
==============================================================================
--- stable/11/etc/rc Mon May 22 15:53:30 2017 (r318651)
+++ stable/11/etc/rc Mon May 22 16:07:17 2017 (r318652)
@@ -135,16 +135,16 @@ done
# Note: this assumes firstboot_sentinel is on / when we have
# a read-only /, or that it is on media that's writable.
if [ -e ${firstboot_sentinel} ]; then
- [ ${root_rw_mount} = "yes" ] || mount -uw /
+ [ ${root_rw_mount#[Yy][Ee][Ss]} = "" ] || mount -uw /
chflags -R 0 ${firstboot_sentinel}
rm -rf ${firstboot_sentinel}
if [ -e ${firstboot_sentinel}-reboot ]; then
chflags -R 0 ${firstboot_sentinel}-reboot
rm -rf ${firstboot_sentinel}-reboot
- [ ${root_rw_mount} = "yes" ] || mount -ur /
+ [ ${root_rw_mount#[Yy][Ee][Ss]} = "" ] || mount -ur /
kill -INT 1
fi
- [ ${root_rw_mount} = "yes" ] || mount -ur /
+ [ ${root_rw_mount#[Yy][Ee][Ss]} = "" ] || mount -ur /
fi
echo ''
More information about the svn-src-stable-11
mailing list