summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorscottl <scottl@FreeBSD.org>2005-07-11 03:59:25 +0000
committerscottl <scottl@FreeBSD.org>2005-07-11 03:59:25 +0000
commitfb0e3fc91b71a7c77c12753c471331fc4757d33c (patch)
treea7af3e09e6ffe3ee454b53ffb89e6622625203fe /release
parentc3747a85fb453031cd429979e8e5b26765970c3f (diff)
downloadFreeBSD-src-fb0e3fc91b71a7c77c12753c471331fc4757d33c.zip
FreeBSD-src-fb0e3fc91b71a7c77c12753c471331fc4757d33c.tar.gz
Adapt the mfsroot environment of sysinstall to the needs of the new dhclient.
This involves having passwd bits available so that seteuid("_dhcp") work, and creating /var/empty so that chroot(_VAR_EMPTY) works. My gut feeling is that the better solution is to make privsep and chroot optional in dhclient, but this works well for now and is low-risk. Approved by: re
Diffstat (limited to 'release')
-rw-r--r--release/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/release/Makefile b/release/Makefile
index f8e462e..31c90fd 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -698,7 +698,8 @@ release.8:
rm -rf ${RD}/mfsfd
mkdir ${RD}/mfsfd
cd ${RD}/mfsfd && \
- mkdir -p etc/defaults dev mnt stand/etc/defaults stand/help
+ mkdir -p etc/defaults dev mnt stand/etc/defaults stand/help \
+ var/empty
@cd ${.CURDIR} && $(MAKE) installCRUNCH CRUNCH=boot \
DIR=${RD}/mfsfd/stand ZIP=false
( cd ${RD}/mfsfd && \
@@ -711,6 +712,8 @@ release.8:
${RD}/mfsfd/etc/defaults/pccard.conf
.endif
cp ${.CURDIR}/../etc/usbd.conf ${RD}/mfsfd/etc/usbd.conf
+ cp ${.CURDIR}/../etc/master.passwd ${RD}/mfsfd/etc/master.passwd
+ pwd_mkdb -d ${RD}/mfsfd/etc -p ${RD}/mfsfd/etc/master.passwd
( for F in defaults/rc.conf netconfig protocols ; do \
sed -e '/^#.*$$/d' -e 's/[:space:]*#.*$$//g' \
${RD}/trees/base/etc/$$F > ${RD}/mfsfd/stand/etc/$$F ; \
OpenPOWER on IntegriCloud