Changeset d5eaa4d


Ignore:
Timestamp:
11/25/13 11:30:55 (11 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
55549dde
Parents:
6653818
Message:

When doing a network install, use the default pkgng repo

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pc-sysinstall/backend/functions-installpackages.sh

    r6653818 rd5eaa4d  
    7070    PKGNAME="${i}" 
    7171 
    72     # See if we need to determine the package format we are working with 
    73     PKGADD="pkg -C /mnt/pkg.conf install -y ${PKGNAME}" 
     72    # When doing a pkg install, if on local media, use a pkg.conf from /dist/ 
     73    if [ "${INSTALLMEDIUM}" != "ftp" ] ; then 
     74      PKGADD="pkg -C /mnt/pkg.conf install -y ${PKGNAME}" 
     75    else 
     76      # Doing a network install, use the default pkg.conf 
     77      PKGADD="pkg install -y ${PKGNAME}" 
     78    fi 
     79 
    7480    PKGINFO="pkg info" 
    7581 
Note: See TracChangeset for help on using the changeset viewer.