Changeset e5240d6


Ignore:
Timestamp:
09/15/13 17:59:50 (13 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:
8a1ef9e
Parents:
2c39b15
Message:

Fix a bug causing warden to keep using 9.1-RELEASE for templates,
also corrected some issues with portjails starting properly

Location:
src-sh/warden
Files:
4 edited

Legend:

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

    r2c39b15 re5240d6  
    652652" 
    653653}; 
    654  
    655654 
    656655# Fix old style meta-data, can be removed after 9.1 
     
    12801279esac 
    12811280 
     1281 
    12821282exit 0 
  • src-sh/warden/conf/warden.conf

    r1620346 re5240d6  
    1111# Location of the jails 
    1212JDIR: /usr/jails 
    13  
    14 # FreeBSD release to use 
    15 FREEBSD_RELEASE: 9.1-RELEASE 
  • src-sh/warden/scripts/backend/createjail.sh

    r2c39b15 re5240d6  
    9090# If using a ARCHIVEFILE we can skip this step 
    9191if [ -z "$TEMPLATE" -a -z "$ARCHIVEFILE" ] ; then 
     92  which uname 
     93  uname -r 
    9294  DEFTEMPLATE="`uname -r | cut -d '-' -f 1-2`-${ARCH}" 
     95  echo "DEF: $DEFTEMPLATE" 
    9396 
    9497  # If on a plugin jail, lets change the nickname 
  • src-sh/warden/scripts/backend/functions.sh

    r2c39b15 re5240d6  
    185185### Mount all needed filesystems for the jail 
    186186mountjailxfs() { 
     187 
     188  if [ ! -d "${JDIR}/${1}/" ] ; then 
     189     exit_err "Invalid jail directory: ${JDIR}/${1}" 
     190  fi 
    187191 
    188192  # Update the user files on the portjail 
Note: See TracChangeset for help on using the changeset viewer.