Changeset 2a26628


Ignore:
Timestamp:
12/09/13 12:49:15 (19 months ago)
Author:
Kris Moore <kris@…>
Branches:
9.2-release
Children:
9aa2146
Parents:
3d32d18
Message:

Backport the pkgng 1.2.x fixes to 9.2

Location:
src-sh/pc-extractoverlay
Files:
2 added
2 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pc-extractoverlay/desktop-overlay/usr/local/etc/pkg.conf

    rcfad5bc r2a26628  
    1 packagesite: pkg+http://pkg.cdn.pcbsd.org/VERSION/ARCH 
    2 PUBKEY: /usr/local/etc/pkg-pubkey.cert 
    31PKG_CACHEDIR: /usr/local/tmp 
     2repos_dir: [ 
     3                "/usr/local/etc/pkg/repos" 
     4           ] 
  • src-sh/pc-extractoverlay/pc-extractoverlay

    r04630fb r2a26628  
    106106  fi 
    107107 
    108   # See if we need to adjust pkg.conf 
    109   grep -q "ARCH" /usr/local/etc/pkg.conf 
     108  # See if we need to adjust pcbsd.conf 
     109  grep -q "ARCH" /usr/local/etc/pkg/repos/pcbsd.conf 
    110110  if [ $? -eq 0 ] ; then 
    111111    ARCH=`uname -m` 
    112112    FBSDVER=`uname -r | cut -d '-' -f 1-2` 
    113     sed -i '' "s|VERSION|$FBSDVER|g" /usr/local/etc/pkg.conf 
     113    sed -i '' "s|VERSION|$FBSDVER|g" /usr/local/etc/pkg/repos/pcbsd.conf 
    114114    if [ $? -ne 0 ] ; then 
    115        echo "WARNING: Failed setting VERSION in pkg.conf" 
     115       echo "WARNING: Failed setting VERSION in pcbsd.conf" 
    116116       status="1" 
    117117    fi 
    118     sed -i '' "s|ARCH|$ARCH|g" /usr/local/etc/pkg.conf 
     118    sed -i '' "s|ARCH|$ARCH|g" /usr/local/etc/pkg/repos/pcbsd.conf 
    119119    if [ $? -ne 0 ] ; then 
    120        echo "WARNING: Failed setting ARCH in pkg.conf" 
     120       echo "WARNING: Failed setting ARCH in pcbsd.conf" 
    121121       status="1" 
    122122    fi 
  • src-sh/pc-extractoverlay/server-overlay/usr/local/etc/fscd.conf

    r1620346 r2a26628  
    1 # FSCD Conf File - Enable services with "fscadm" 
  • src-sh/pc-extractoverlay/server-overlay/usr/local/etc/pkg.conf

    rcfad5bc r2a26628  
    1 packagesite: pkg+http://pkg.cdn.pcbsd.org/VERSION/ARCH 
    2 PUBKEY: /usr/local/etc/pkg-pubkey.cert 
    31PKG_CACHEDIR: /usr/local/tmp 
     2repos_dir: [ 
     3                "/usr/local/etc/pkg/repos" 
     4           ] 
Note: See TracChangeset for help on using the changeset viewer.