diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh --- a/tools/tools/nanobsd/defaults.sh +++ b/tools/tools/nanobsd/defaults.sh @@ -571,13 +571,30 @@ # create diskless marker file touch etc/diskless - [ -n "${NANO_NOPRIV_BUILD}" ] && chmod 666 etc/defaults/rc.conf - - # Make root filesystem R/O by default - echo "root_rw_mount=NO" >> etc/defaults/rc.conf - # Disable entropy file, since / is read-only /var/db/entropy should be enough? - echo "entropy_file=NO" >> etc/defaults/rc.conf + [ -n "${NANO_NOPRIV_BUILD}" ] && chmod 666 boot/defaults/loader.conf + { + echo + echo '### NanoBSD configuration ##################################' + echo 'hostuuid_load="NO"' + echo 'entropy_cache_load="NO" # Disable loading cached entropy at boot time' + } >> boot/defaults/loader.conf + [ -n "${NANO_NOPRIV_BUILD}" ] && chmod 444 boot/defaults/loader.conf + [ -n "${NANO_NOPRIV_BUILD}" ] && chmod 666 etc/defaults/rc.conf + { + echo + echo '##############################################################' + echo '### NanoBSD options ########################################' + echo '##############################################################' + echo + echo 'kldxref_enable="NO" # Disable building linker.hints files with kldxref(8).' + echo 'root_rw_mount="NO" # Inhibit remounting root read-write.' + echo 'entropy_boot_file="NO" # Disable very early (used at early boot time)' + echo ' # entropy caching through reboots.' + echo 'entropy_file="NO" # Disable late (used when going multi-user)' + echo ' # entropy through reboots.' + echo 'entropy_dir="NO" # Disable caching entropy via cron.' + } >> etc/defaults/rc.conf [ -n "${NANO_NOPRIV_BUILD}" ] && chmod 444 etc/defaults/rc.conf # save config file for scripts