From 2300307e5fb9c0214aa94210cd345dc914ce19af Mon Sep 17 00:00:00 2001 From: Chris Buechler Date: Fri, 3 Jul 2015 23:11:11 -0500 Subject: de-activate sync on upgrade where it's enabled now that the root passwd/group problem is fixed. Ticket #4523 --- tmp/pre_upgrade_command | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tmp/pre_upgrade_command b/tmp/pre_upgrade_command index 5bfd891..2ad365f 100644 --- a/tmp/pre_upgrade_command +++ b/tmp/pre_upgrade_command @@ -6,11 +6,11 @@ PRIOR_VERSION=`uname -r | cut -d'.' -f1` echo $PRIOR_VERSION > /tmp/pre_upgrade_version -# Activate sync on root filesystem. See ticket #4523 +# De-activate sync on root filesystem. See ticket #4523 # Back up original fstab /bin/cp /etc/fstab /etc/fstab.orig -# Activate sync on the root slice only. This will not match NanoBSD since it already has sync,noatime -/usr/bin/sed -i '' 's/^\(\/.*[[:space:]]*\/[[:space:]]*ufs[[:space:]]*\)rw\([[:space:]]*[[:digit:]][[:space:]]*[[:digit:]]\)$/\1rw,sync\2/' /etc/fstab +# De-activate sync on the root slice only. This will not match NanoBSD since it already has sync,noatime +/usr/bin/sed -i '' 's/^\(\/.*[[:space:]]*\/[[:space:]]*ufs[[:space:]]*\)rw,sync\([[:space:]]*[[:digit:]][[:space:]]*[[:digit:]]\)$/\1rw\2/' /etc/fstab # Hack to workaround ticket #3749 if [ ${PRIOR_VERSION} -le 8 ] && grep -q 'sh /etc/rc.reboot' /etc/rc.firmware; then -- cgit v1.1