Changeset 12db463d


Ignore:
Timestamp:
05/09/14 07:37:55 (10 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1
Children:
16004f4
Parents:
7d1cdbb
Message:

Add option when checking for pkgupdates in a jail to update the
pkgng config file for the PC-BSD repo beforehand

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pc-updatemanager/pc-updatemanager

    reee006a r12db463d  
    971971  rc_halt "${PKG_CMD} update" 
    972972 
     973  # See if we need to update the jails pkgng config file 
     974  if [ -n "$INJAIL" -a "$1" = "-uppkgconfig" ] ; then 
     975     # Need to update pkgng config in the jail to match systems 
     976     jDir="`jls | grep " $INJAIL " | awk '{print $4}'`" 
     977     if [ ! -d "$jDir/usr/local/etc/pkg/repos" ] ; then 
     978        mkdir -p ${jDir}/usr/local/etc/pkg/repos 
     979     fi 
     980     cp /usr/local/etc/pkg/repos/pcbsd.conf ${jDir}/usr/local/etc/pkg/repos/ 
     981  fi 
     982 
    973983  ${PKG_CMD} ${PKG_FLAG} upgrade -n >/tmp/.pkgData.$$ 
    974984  if [ $? -ne 0 ] ; then 
     
    11131123        chbranch) get_update_file 
    11141124                  do_branch "${2}" ; break ;; 
    1115         pkgcheck) checkup_pkgs ; break ;; 
     1125        pkgcheck) shift ; checkup_pkgs "$1" ; break ;; 
    11161126       pkgupdate) update_pkgs "$2" ; break ;; 
    11171127finish-major-update) finish_major_fbsd_update ; break ;; 
Note: See TracChangeset for help on using the changeset viewer.