Skip to content

Commit 92e9301

Browse files
ifreundemaste
authored andcommitted
release: install pkg to install media
This is the most straightforward way to make installation of base system packages from install media possible. Bootstrapping pkg at install time does not work since the root filesystem of install media is immutable. Reviewed by: bz, cperciva, emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49968
1 parent 22e564c commit 92e9301

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

release/Makefile

+7
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ disc1: packagesystem
193193
.endif
194194
.if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG))
195195
# Install packages onto release media.
196+
${PKG_INSTALL} pkg || true
196197
${PKG_INSTALL} wifi-firmware-kmod-release || true
197198
${PKG_CLEAN} || true
198199
.endif
@@ -231,6 +232,11 @@ bootonly: packagesystem
231232
cp MANIFEST ${.TARGET}/usr/freebsd-dist
232233
echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG
233234
echo "./usr/freebsd-dist/MANIFEST type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG
235+
.if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG))
236+
# Install packages onto release media.
237+
${PKG_INSTALL} pkg || true
238+
${PKG_CLEAN} || true
239+
.endif
234240
# Set up installation environment
235241
ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
236242
echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
@@ -266,6 +272,7 @@ dvd: packagesystem
266272
.endif
267273
.if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG))
268274
# Install packages onto release media.
275+
${PKG_INSTALL} pkg || true
269276
${PKG_INSTALL} wifi-firmware-kmod-release || true
270277
${PKG_CLEAN} || true
271278
.endif

0 commit comments

Comments
 (0)