Changeset 77fd45f


Ignore:
Timestamp:
07/01/13 10:32:21 (15 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
Children:
359a09e, 5a47ba4
Parents:
01dd436
Message:

Be more agnostic to uname -r output, so we can use 9-STABLE
or 10-CURRENT as our tags

Location:
src-sh/warden
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-sh/warden/bin/warden

    r9cc2f9c r77fd45f  
    349349  create: 
    350350     -fbsd <version>   - FreeBSD Version, 9.1-RELEASE, 9.0-RELEASE, etc 
    351      -trueos <version> - TrueOS Version, 9-TRUEOS, 10-TRUEOS, etc 
     351     -trueos <version> - TrueOS Version, 9.1-RELEASE, 9-STABLE, etc 
    352352     -arch <arch type> - System architecture, i386/amd64 
    353353     -tar <file>       - Use tar archive as template contents (Ignores -arch / -fbsd) 
  • src-sh/warden/scripts/backend/createjail.sh

    r9788f38 r77fd45f  
    107107      FLAGS="-arch $ARCH -nick $DEFTEMPLATE" 
    108108 
    109       uname -r 2>&1 | grep -q "TRUEOS" 
    110       if [ $? -eq 0 ] ; then 
    111          FLAGS="-trueos `uname -r | cut -d '-' -f 1-2` $FLAGS" ; export FLAGS 
    112       else 
    113          FLAGS="-fbsd `uname -r | cut -d '-' -f 1-2` $FLAGS" ; export FLAGS 
    114       fi 
     109      FLAGS="-trueos `uname -r | cut -d '-' -f 1-2` $FLAGS" ; export FLAGS 
    115110 
    116111      if [ "${PLUGINJAIL}" = "YES" ] ; then 
Note: See TracChangeset for help on using the changeset viewer.