[PC-BSD Commits] r15867 - in pcbsd/current: src-sh/pc-metapkgmanager system-overlay/usr/local/etc

[svn at pcbsd.org]

Author: kris
Date: 2012-03-21 07:39:07 +0000 (Wed, 21 Mar 2012)
New Revision: 15867

Modified:
   pcbsd/current/src-sh/pc-metapkgmanager/pc-metapkgmanager
   pcbsd/current/system-overlay/usr/local/etc/pcbsd.conf
Log:

Add the default meta-pkg set specification to pcbsd.conf



Modified: pcbsd/current/src-sh/pc-metapkgmanager/pc-metapkgmanager
===================================================================
--- pcbsd/current/src-sh/pc-metapkgmanager/pc-metapkgmanager	2012-03-21 07:25:14 UTC (rev 15866)
+++ pcbsd/current/src-sh/pc-metapkgmanager/pc-metapkgmanager	2012-03-21 07:39:07 UTC (rev 15867)
@@ -28,12 +28,8 @@
 DBDIR="/var/db/pc-metapkgmanager/pkgsets"
 LOGFILE="/tmp/.pc-metapkgmanager.log"
 FTP_PASSIVE_MODE="YES" ; export FTP_PASSIVE_MODE
+PCBSD_ETCCONF="/usr/local/etc/pcbsd.conf"
 
-# The default PKGSET
-PKGSET="pcbsd"
-MPDIR="${DBDIR}/${PKGSET}"
-
-
 display_usage() {
         cat <<EOF
 usage: `basename $0` [options]
@@ -591,6 +587,14 @@
 _pkgflags=""
 PKGUPDATES=""
 
+# The default PKGSET
+PKGSET="pcbsd"
+
+# Check if we have a different dataset specified in pcbsd.conf
+_pkgChk="`sed -n 's/PCBSD_METAPKGSET: //p' ${PCBSD_ETCCONF}`"
+if [ -n "${_pkgChk}" ] ; then PKGSET="$_pkgChk" ; fi
+MPDIR="${DBDIR}/${PKGSET}"
+
 if [ $# -eq 0 ]; then display_usage; fi
 
 # Parse ye olde cli flags

Modified: pcbsd/current/system-overlay/usr/local/etc/pcbsd.conf
===================================================================
--- pcbsd/current/system-overlay/usr/local/etc/pcbsd.conf	2012-03-21 07:25:14 UTC (rev 15866)
+++ pcbsd/current/system-overlay/usr/local/etc/pcbsd.conf	2012-03-21 07:39:07 UTC (rev 15867)
@@ -2,3 +2,6 @@
 
 # Default PC-BSD Mirror for System Updates / Meta-Pkgs
 PCBSD_MIRROR: ftp://mirrors.isc.org/pub/pcbsd
+
+# The current meta package set
+PCBSD_METAPKGSET: pcbsd