Date: Wed, 18 Dec 2013 01:14:26 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r259533 - in stable/10: release release/scripts usr.sbin/bsdconfig/share/packages Message-ID: <201312180114.rBI1EQiY039431@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Wed Dec 18 01:14:25 2013 New Revision: 259533 URL: http://svnweb.freebsd.org/changeset/base/259533 Log: 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 Added: stable/10/release/scripts/FreeBSD_install_cdrom.conf - copied unchanged from r259426, head/release/scripts/FreeBSD_install_cdrom.conf Modified: stable/10/release/Makefile stable/10/usr.sbin/bsdconfig/share/packages/index.subr Directory Properties: stable/10/ (props changed) Modified: stable/10/release/Makefile ============================================================================== --- stable/10/release/Makefile Wed Dec 18 00:14:58 2013 (r259532) +++ stable/10/release/Makefile Wed Dec 18 01:14:25 2013 (r259533) @@ -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 Copied: stable/10/release/scripts/FreeBSD_install_cdrom.conf (from r259426, head/release/scripts/FreeBSD_install_cdrom.conf) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/release/scripts/FreeBSD_install_cdrom.conf Wed Dec 18 01:14:25 2013 (r259533, copy of r259426, head/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 +} + Modified: stable/10/usr.sbin/bsdconfig/share/packages/index.subr ============================================================================== --- stable/10/usr.sbin/bsdconfig/share/packages/index.subr Wed Dec 18 00:14:58 2013 (r259532) +++ stable/10/usr.sbin/bsdconfig/share/packages/index.subr Wed Dec 18 01:14:25 2013 (r259533) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312180114.rBI1EQiY039431>