Changeset 74a67ca


Ignore:
Timestamp:
12/11/13 09:54:36 (9 months ago)
Author:
Kris Moore <kris@…>
Branches:
9.2-release
Children:
8af4a68
Parents:
f0f52bf
Message:

Backport warden / pkgng fixes for 9.2

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-sh/warden/scripts/backend/functions.sh

    r9b2e2e6 r74a67ca  
    800800rm pkg.txz 
    801801 
    802 echo "packagesite: pkg+http://pkg.cdn.pcbsd.org/${release}/${arch}" >/usr/local/etc/pkg.conf 
    803 echo "PUBKEY: /usr/local/etc/pkg-pubkey.cert" >>/usr/local/etc/pkg.conf 
    804 echo "PKG_CACHEDIR: /usr/local/tmp" >>/usr/local/etc/pkg.conf 
    805  
     802# Create the pkg.conf file 
     803echo "PKG_CACHEDIR: /usr/local/tmp 
     804repos_dir: [ 
     805                \"/usr/local/etc/pkg/repos\" 
     806           ]" > /usr/local/etc/pkg.conf 
     807 
     808# Create the repo dirs 
     809mkdir -p /usr/local/etc/pkg/repos 2>/dev/null 
     810mkdir -p /usr/local/etc/pkg/fingerprints/pcbsd/trusted 2>/dev/null 
     811mkdir -p /usr/local/etc/pkg/fingerprints/pcbsd/revoked 2>/dev/null 
     812 
     813# Save the repo configuration file 
     814echo "pcbsd: { 
     815               url: \"http://pkg.cdn.pcbsd.org/${release}/${arch}\", 
     816               signature_type: \"fingerprints\", 
     817               fingerprints: \"/usr/local/etc/pkg/fingerprints/pcbsd\", 
     818               enabled: true 
     819              }" > /usr/local/etc/pkg/repos/pcbsd.conf 
     820 
     821# Save the fingerprint file 
     822echo "function: sha256 
     823fingerprint: b2b9e037f938cf20ba68aa85ac88c15889c729a7f6b70c25069774308e760a03" > /usr/local/etc/pkg/fingerprints/pcbsd/trusted/pkg.cdn.pcbsd.org.20131209 
     824 
     825pkg update 
    806826pkg install -y pcbsd-utils 
    807827pc-extractoverlay ports 
     
    809829exit $? 
    810830__EOF__ 
     831 
    811832} 
    812833 
     
    833854mount -t devfs devfs /dev 
    834855 
    835 echo "packagesite: pkg+http://pkg.cdn.pcbsd.org/${release}/${arch}" >/usr/local/etc/pkg.conf 
    836 echo "PUBKEY: /usr/local/etc/pkg-pubkey.cert" >>/usr/local/etc/pkg.conf 
    837 echo "PKG_CACHEDIR: /usr/local/tmp" >>/usr/local/etc/pkg.conf 
     856# Create the pkg.conf file 
     857echo "PKG_CACHEDIR: /usr/local/tmp 
     858repos_dir: [  
     859                \"/usr/local/etc/pkg/repos\" 
     860           ]" > /usr/local/etc/pkg.conf 
     861 
     862# Create the repo dirs 
     863mkdir -p /usr/local/etc/pkg/repos 2>/dev/null 
     864mkdir -p /usr/local/etc/pkg/fingerprints/pcbsd/trusted 2>/dev/null 
     865mkdir -p /usr/local/etc/pkg/fingerprints/pcbsd/revoked 2>/dev/null 
     866 
     867# Save the repo configuration file 
     868echo "pcbsd: { 
     869               url: \"http://pkg.cdn.pcbsd.org/${release}/${arch}\", 
     870               signature_type: \"fingerprints\", 
     871               fingerprints: \"/usr/local/etc/pkg/fingerprints/pcbsd\", 
     872               enabled: true 
     873              }" > /usr/local/etc/pkg/repos/pcbsd.conf 
     874 
     875# Save the fingerprint file 
     876echo "function: sha256 
     877fingerprint: b2b9e037f938cf20ba68aa85ac88c15889c729a7f6b70c25069774308e760a03" > /usr/local/etc/pkg/fingerprints/pcbsd/trusted/pkg.cdn.pcbsd.org.20131209 
     878 
     879pkg update 
    838880pkg install -y pcbsd-utils 
    839881__EOF__ 
Note: See TracChangeset for help on using the changeset viewer.