Changeset ce6fcd7


Ignore:
Timestamp:
04/23/13 11:04:25 (19 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.1-release, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
e013d8d2
Parents:
acdf89b
Message:

Also fix same issue with wrong system version being used from uname -r

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

Legend:

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

    r1620346 rce6fcd7  
    260260  mkdir -p "${JAILDIR}/usr/src" 
    261261  cd ${JAILDIR} 
    262   SYSVER="$(uname -r)" 
     262  SYSVER="$(uname -r | cut -d '-' -f 1-2)" 
    263263  get_file_from_mirrors "/${SYSVER}/${ARCH}/dist/src.txz" "src.txz" 
    264264  if [ $? -ne 0 ] ; then 
  • src-sh/warden/scripts/backend/functions.sh

    r1620346 rce6fcd7  
    730730  local outfile="${2}" 
    731731 
    732   local release="$(uname -r)" 
     732  local release="$(uname -r | cut -d '-' -f 1-2)" 
    733733  local arch="$(uname -m)" 
    734734 
     
    757757  local outfile="${2}" 
    758758 
    759   local release="$(uname -r)" 
     759  local release="$(uname -r | cut -d '-' -f 1-2)" 
    760760  local arch="$(uname -m)" 
    761761 
     
    802802    jailtype="standard" 
    803803  fi 
    804   local release="$(uname -r)" 
     804  local release="$(uname -r | cut -d '-' -f 1-2)" 
    805805  local arch="$(uname -m)" 
    806806 
Note: See TracChangeset for help on using the changeset viewer.