Use /bin/rm to remove /firstboot*. Otherwise rm -i alias is picked

up and can cause issues on boot with the prompts. Fix the read-only
root case with horrible kludge of mounting rw removing the files, then
mounting ro. But since that's no more horrible than the kludge of
using marker files in /. With this change, NanoBSD configs can safely
use /firstboot + growfs to produce minimal images that grow to the
size of the card.
This commit is contained in:
imp 2016-01-03 19:18:48 +00:00
parent e3d5f3b7b8
commit c6f9988dbb

7
etc/rc
View File

@ -131,11 +131,14 @@ done
# Remove the firstboot sentinel, and reboot if it was requested. # Remove the firstboot sentinel, and reboot if it was requested.
if [ -e ${firstboot_sentinel} ]; then if [ -e ${firstboot_sentinel} ]; then
rm ${firstboot_sentinel} [ ${root_rw_mount} = "yes" ] || mount -uw /
/bin/rm ${firstboot_sentinel}
if [ -e ${firstboot_sentinel}-reboot ]; then if [ -e ${firstboot_sentinel}-reboot ]; then
rm ${firstboot_sentinel}-reboot /bin/rm ${firstboot_sentinel}-reboot
[ ${root_rw_mount} = "yes" ] || mount -ur /
kill -INT 1 kill -INT 1
fi fi
[ ${root_rw_mount} = "yes" ] || mount -ur /
fi fi
echo '' echo ''