svn commit: r323883 - head/tools/tools/nanobsd
Warner Losh
imp at FreeBSD.org
Thu Sep 21 23:10:57 UTC 2017
Author: imp
Date: Thu Sep 21 23:10:56 2017
New Revision: 323883
URL: https://svnweb.freebsd.org/changeset/base/323883
Log:
Always create usr/local/etc -> /etc/local symlink
/usr/local/etc gets created and populated by packages. However, if no
packages are installed when setup_nanobsd is run, this symlink won't
get created, causing problems if packages are installed later (say on
first boot). Therefore, always create the symlink and etc/local. It
does no harm and may help.
Inspired by crochet issue #183 (consuingly says NanoBSD, means crochet)
Sponsored by: Netflix
Modified:
head/tools/tools/nanobsd/defaults.sh
Modified: head/tools/tools/nanobsd/defaults.sh
==============================================================================
--- head/tools/tools/nanobsd/defaults.sh Thu Sep 21 23:05:32 2017 (r323882)
+++ head/tools/tools/nanobsd/defaults.sh Thu Sep 21 23:10:56 2017 (r323883)
@@ -527,15 +527,20 @@ setup_nanobsd ( ) (
# have hardcoded paths under ${prefix}/etc are not tweakable.
if [ -d usr/local/etc ] ; then
(
- mkdir -p etc/local
cd usr/local/etc
find . -print | cpio -dumpl ../../../etc/local
cd ..
rm -rf etc
- ln -s ../../etc/local etc
)
fi
+ # Always setup the usr/local/etc -> etc/local symlink.
+ # usr/local/etc gets created by packages, but if no packages
+ # are installed by this point, but are later in the process,
+ # the symlink not being here causes problems. It never hurts
+ # to have the symlink in error though.
+ ln -s ../../etc/local usr/local/etc
+
for d in var etc
do
# link /$d under /conf
@@ -581,6 +586,9 @@ setup_nanobsd_etc ( ) (
echo "/dev/${NANO_DRIVE}${NANO_ROOT} / ufs ro 1 1" > etc/fstab
echo "/dev/${NANO_DRIVE}${NANO_SLICE_CFG} /cfg ufs rw,noauto 2 2" >> etc/fstab
mkdir -p cfg
+
+ # Create directory for eventual /usr/local/etc contents
+ mkdir -p etc/local
)
)
More information about the svn-src-all
mailing list