Changeset f541489


Ignore:
Timestamp:
07/01/13 11:17:30 (17 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
74e5b1c
Parents:
5a47ba4 (diff), 359a09e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Location:
src-sh
Files:
1 added
4 edited

Legend:

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

    r1620346 r5a47ba4  
    1 packagesite: http://ftp.pcbsd.org/pub/mirror/packages/VERSION/ARCH 
    2 HTTP_MIRROR: http 
     1packagesite: http://pkg.cdn.pcbsd.org/VERSION/ARCH 
    32PUBKEY: /usr/local/etc/pkg-pubkey.cert 
    43PKG_CACHEDIR: /usr/local/tmp 
  • src-sh/pc-extractoverlay/server-overlay/usr/local/etc/pkg.conf

    r1620346 r5a47ba4  
    1 packagesite: http://ftp.pcbsd.org/pub/mirror/packages/VERSION/ARCH 
    2 HTTP_MIRROR: http 
     1packagesite: http://pkg.cdn.pcbsd.org/VERSION/ARCH 
    32PUBKEY: /usr/local/etc/pkg-pubkey.cert 
    43PKG_CACHEDIR: /usr/local/tmp 
  • src-sh/pc-updatemanager/pc-updatemanager

    racc5eab r5a47ba4  
    443443  # Set the new pkg.conf file to the new repo 
    444444  local arch=`uname -m` 
    445   echo "packagesite: http://ftp.pcbsd.org/pub/mirror/packages/$rel/$arch" >/usr/local/etc/pkg.conf 
     445  echo "packagesite: http://pkg.cdn.pcbsd.org/$rel/$arch" >/usr/local/etc/pkg.conf 
    446446  echo "PUBKEY: /usr/local/etc/pkg-pubkey.cert" >>/usr/local/etc/pkg.conf 
    447447  echo "PKG_CACHEDIR: /usr/local/tmp" >>/usr/local/etc/pkg.conf 
  • src-sh/warden/scripts/backend/functions.sh

    r9788f38 r5a47ba4  
    742742rm pkg.txz 
    743743 
    744 echo "packagesite: ${mirror}/packages/${release}/${arch}" >/usr/local/etc/pkg.conf 
    745 echo "HTTP_MIRROR: http" >>/usr/local/etc/pkg.conf 
     744echo "packagesite: http://pkg.cdn.pcbsd.org/${release}/${arch}" >/usr/local/etc/pkg.conf 
    746745echo "PUBKEY: /usr/local/etc/pkg-pubkey.cert" >>/usr/local/etc/pkg.conf 
    747746echo "PKG_CACHEDIR: /usr/local/tmp" >>/usr/local/etc/pkg.conf 
     
    773772mount -t devfs devfs /dev 
    774773 
    775 echo "packagesite: ${mirror}/packages/${release}/${arch}" >/usr/local/etc/pkg.conf 
    776 echo "HTTP_MIRROR: http" >>/usr/local/etc/pkg.conf 
     774echo "packagesite: http://pkg.cdn.pcbsd.org/${release}/${arch}" >/usr/local/etc/pkg.conf 
    777775echo "PUBKEY: /usr/local/etc/pkg-pubkey.cert" >>/usr/local/etc/pkg.conf 
    778776echo "PKG_CACHEDIR: /usr/local/tmp" >>/usr/local/etc/pkg.conf 
Note: See TracChangeset for help on using the changeset viewer.