diff options
| author | gjb <gjb@FreeBSD.org> | 2013-12-18 01:14:25 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2013-12-18 01:14:25 +0000 |
| commit | 4dddfdac356a3e7af5cf8e2b27a998f3060ef3f0 (patch) | |
| tree | f376a426edbc24f3e6017f4d4e813dac6002095d /release | |
| parent | 2c4d831850847a741a27b6076afc0c9ee952ae0f (diff) | |
| download | FreeBSD-src-4dddfdac356a3e7af5cf8e2b27a998f3060ef3f0.zip FreeBSD-src-4dddfdac356a3e7af5cf8e2b27a998f3060ef3f0.tar.gz | |
MFC r259426, r259427:
r259426:
Add a pkg(8) repository configuration file for cdrom-based package
installation.
As part of the 'pkg-stage' target, copy the configuration file
to the 'packages/repos/' directory on the DVD filesystem.
r259427:
Export 'REPOS_DIR' when the selected source medium for package
installation is cdrom. This enables bsdconfig(8) to make use
of the on-disc pkg(8) repository configuration, which fixes
package selection and installation from the dvd installer.
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile | 4 | ||||
| -rw-r--r-- | release/scripts/FreeBSD_install_cdrom.conf | 12 |
2 files changed, 16 insertions, 0 deletions
diff --git a/release/Makefile b/release/Makefile index f6af5dc..69e0fab 100644 --- a/release/Makefile +++ b/release/Makefile @@ -225,7 +225,11 @@ pkg-stage: .if !defined(NOPKG) && exists(${.CURDIR}/${TARGET}/pkg-stage.conf) sh ${.CURDIR}/scripts/pkg-stage.sh ${.CURDIR}/${TARGET}/pkg-stage.conf \ ${REVISION} + mkdir -p ${.OBJDIR}/dvd/packages/repos/ + cp ${.CURDIR}/scripts/FreeBSD_install_cdrom.conf \ + ${.OBJDIR}/dvd/packages/repos/ .endif + touch ${.TARGET} cdrom: disc1.iso bootonly.iso dvdrom: dvd1.iso diff --git a/release/scripts/FreeBSD_install_cdrom.conf b/release/scripts/FreeBSD_install_cdrom.conf new file mode 100644 index 0000000..44554b1 --- /dev/null +++ b/release/scripts/FreeBSD_install_cdrom.conf @@ -0,0 +1,12 @@ +# +# $FreeBSD$ +# +# The pkg(8) repository configuration file for the installation DVD. +# + +FreeBSD_install_cdrom: { + url: "file:///dist/packages/${ABI}", + mirror_type: "none", + enabled: yes +} + |
