rc: makefs -> mkimg migration seems to fix this, yay!

This commit is contained in:
Franco Fichtner 2016-12-02 10:23:58 +01:00
parent 28b058c895
commit 46fc7fe3aa

View File

@ -77,6 +77,9 @@ while [ ${attempts} -lt 3 ]; do
attempts=$((attempts+1))
done
# clear growfs marker now that we are read/write
rm -f ${GROWFS_MARKER}
# see if / is writable (aka. non-LiveCD boot)
if _tmpdir=$(mktemp -d -q /.diskless.XXXXXX); then
# only remove the directory
@ -89,17 +92,6 @@ else
done
fi
if [ -f ${GROWFS_MARKER} ]; then
# clean up the growfs marker to not trigger it anymore
rm ${GROWFS_MARKER}
# while here, why not unbreak the next boot...
FS_DEV=$(glabel status -as | grep ufs/OPNsense | awk '{ print $3 }')
if [ -n "${FS_DEV}" ]; then
echo "/dev/${FS_DEV} / ufs rw,async,noatime 1 1" > /etc/fstab
fi
fi
# regenerate groups and users for base
/usr/local/etc/rc.recover base > /dev/null