Changeset 5ae7c8e


Ignore:
Timestamp:
02/14/14 08:52:22 (7 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
1aede14
Parents:
b0eb497
Message:

Fix bugs creating linux jails debian and gentoo via the Warden

This was a result of a merge with some FreeNAS changes which didn't apply to
our version of Warden

Location:
src-sh/warden
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src-sh/warden/linux-installs/debian-6-squeeze

    r70427a2 r5ae7c8e  
    2828 
    2929    debootstrap squeeze ${TDIR} 
     30    if [ $? -ne 0 ] ; then 
     31      exit 1 
     32    fi 
    3033 
    3134    umount -f ${TDIR}/dev/fd >/dev/null 2>/dev/null 
     
    6972main() 
    7073{ 
    71     case "${1}" in 
    72       get_distfiles) shift; get_distfiles "$@" ;;  
    73       template_install) shift; template_install "$@" ;; 
    74       jail_configure) shift; jail_configure "$@" ;; 
    75       error) shift; error "$@" ;; 
    76     esac 
    7774 
    78     if [ "$?" != "0" ] ; then 
    79       touch "${ERRORFILE}" 
    80     fi 
     75    template_install "$1" 
     76 
     77    jail_configure "$3" 
     78 
     79    exit 0 
    8180} 
    8281 
    8382 
     83# Arg1 = Directory # Arg2 = IP # Arg3 = Meta File 
    8484main "$@" 
  • src-sh/warden/linux-installs/gentoo-stage3-i486

    r70427a2 r5ae7c8e  
    33# Author: Kris Moore <kris@pcbsd.org> 
    44 
     5JDIR="$1" 
    56SELF="gentoo-stage3-i486" 
    67SELFDIR="${JDIR}/.${SELF}" 
     
    215216main() 
    216217{ 
    217     case "${1}" in 
    218       get_distfiles) shift; get_distfiles "$@" ;;  
    219       template_install) shift; template_install "$@" ;; 
    220       jail_configure) shift; jail_configure "$@" ;; 
    221       error) shift; error "$@" ;; 
    222     esac 
    223  
    224     if [ "$?" != "0" ] ; then 
    225       touch "${ERRORFILE}" 
    226     fi 
    227 } 
    228  
    229  
     218    get_distfiles 
     219    template_install "$1" 
     220    jail_configure "$3" 
     221} 
     222 
     223# Arg1 = Directory # Arg2 = IP # Arg3 = Meta dir 
    230224main "$@" 
  • src-sh/warden/scripts/backend/createjail.sh

    r58ffcd7 r5ae7c8e  
    1515  mkdir -p ${JMETADIR} 
    1616  echo "${HOST}" > ${JMETADIR}/host 
     17  echo "${HOST}" > ${JMETADIR}/id 
    1718 
    1819  if [ "${IP4}" != "OFF" ] ; then 
Note: See TracChangeset for help on using the changeset viewer.