summaryrefslogtreecommitdiffstats
path: root/usr.sbin/bsdconfig
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2013-12-18 01:14:25 +0000
committergjb <gjb@FreeBSD.org>2013-12-18 01:14:25 +0000
commit4dddfdac356a3e7af5cf8e2b27a998f3060ef3f0 (patch)
treef376a426edbc24f3e6017f4d4e813dac6002095d /usr.sbin/bsdconfig
parent2c4d831850847a741a27b6076afc0c9ee952ae0f (diff)
downloadFreeBSD-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 'usr.sbin/bsdconfig')
-rwxr-xr-xusr.sbin/bsdconfig/share/packages/index.subr3
1 files changed, 3 insertions, 0 deletions
diff --git a/usr.sbin/bsdconfig/share/packages/index.subr b/usr.sbin/bsdconfig/share/packages/index.subr
index 6e14e4c..535d815 100755
--- a/usr.sbin/bsdconfig/share/packages/index.subr
+++ b/usr.sbin/bsdconfig/share/packages/index.subr
@@ -119,6 +119,9 @@ f_index_initialize()
$DEVICE_TYPE_HTTP_PROXY)
f_getvar $VAR_HTTP_PROXY_PATH __site
__site="$__site/packages/$PKG_ABI" ;;
+ $DEVICE_TYPE_CDROM)
+ __site="file://$MOUNTPOINT/packages/$PKG_ABI"
+ export REPOS_DIR="$MOUNTPOINT/packages/repos" ;;
*) # UFS, DISK, CDROM, USB, DOS, NFS, etc.
__site="file://$MOUNTPOINT/packages/$PKG_ABI"
esac
OpenPOWER on IntegriCloud