From 40adda8665bbcda1bad7e3a6a3c1031027faf39a Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Sun, 23 Oct 2016 18:00:09 +0000 Subject: [PATCH] Use checkyesno instead of rolling my own.. --- etc/rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/rc b/etc/rc index 278c9de494c3..b2ffe0f7a04c 100644 --- a/etc/rc +++ b/etc/rc @@ -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#[Yy][Ee][Ss]} = "" ] || mount -uw / + checkyesno root_rw_mount && 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#[Yy][Ee][Ss]} = "" ] || mount -ur / + checkyesno root_rw_mount && mount -ur / kill -INT 1 fi - [ ${root_rw_mount#[Yy][Ee][Ss]} = "" ] || mount -ur / + checkyesno root_rw_mount && mount -ur / fi echo ''