Changeset 58ffcd7


Ignore:
Timestamp:
01/13/14 10:33:38 (19 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, enter/10, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
a31a662
Parents:
0c876f6
Message:

Fix trac: #932

Correct an issue boot-strapping pkgng / pcbsd-utils into warden created jails
on 10.x

Location:
src-sh/warden/scripts/backend
Files:
2 edited

Legend:

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

    rb5dbe14 r58ffcd7  
    334334 
    335335# Setup TrueOS PKGNG repo / utilities only if on TRUEOS 
    336 if [ "$VANILLA" != "YES" -a -e "${JAILDIR}/etc/rc.delay" ] ; then 
     336if [ "$VANILLA" != "YES" -a -e "${JAILDIR}/etc/rc.conf.pcbsd" ] ; then 
    337337  bootstrap_pkgng "${JAILDIR}" 
    338338  if [ $? -ne 0 ] ; then 
  • src-sh/warden/scripts/backend/functions.sh

    rd6345ef r58ffcd7  
    10871087        fi 
    10881088        VER=`file "$i/bin/sh" | cut -d ',' -f 5 | awk '{print $3}'` 
    1089         if [ -e "$i/etc/rc.delay" ] ; then 
     1089        if [ -e "$i/etc/rc.conf.pcbsd" ] ; then 
    10901090           TYPE="TrueOS" 
    10911091        else 
Note: See TracChangeset for help on using the changeset viewer.