Ignore:
Timestamp:
04/15/13 13:06:48 (20 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:
8901c47
Parents:
4d2a365
Message:

Merge changes from John Hixson and FreeNAS work

File:
1 edited

Legend:

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

    r9bf0d71 r17235d6  
    9292defaultrouter-ipv4: Lets you see the default IPv4 router for this jail 
    9393defaultrouter-ipv6: Lets you see the default IPv6 router for this jail 
    94         flags: Lets you see additional flags to pass to the 'jail' command at startup 
     94             flags: Lets you see additional flags to pass to the 'jail' command at startup 
    9595 
    9696Usage: 
     
    127127defaultrouter-ipv4: Lets you set the default IPv4 router for this jail 
    128128defaultrouter-ipv6: Lets you set the default IPv6 router for this jail 
    129              flags: Lets you set additional flags to pass to the 'jail' command at startup 
     129        flags: Lets you set additional flags to pass to the 'jail' command at startup 
    130130 
    131131Usage: 
     
    806806          ${PROGDIR}/bin/warden-gui ;; 
    807807 
    808     list) require_root  
    809           shift 
    810           ${PROGDIR}/scripts/backend/listjails.sh $* ;; 
     808    list) require_root 
     809        shift 
     810        ${PROGDIR}/scripts/backend/listjails.sh $* ;; 
    811811     
    812812   start) require_root 
     
    10371037         IP4="OFF" 
    10381038         IP6="OFF" 
    1039          SOURCE="NO" 
     1039         SRC="NO" 
    10401040         PORTS="NO" 
    1041          STARTUP="NO" 
     1041         AUTOSTART="NO" 
    10421042         VANILLA="NO" 
    10431043         VERSION= 
     
    10551055                          ;; 
    10561056 
    1057              --src) SOURCE="YES" ;; 
     1057             --src) SRC="YES" ;; 
    10581058             --ports) PORTS="YES" ;; 
    1059              --startauto) STARTUP="YES" ;; 
     1059             --startauto) AUTOSTART="YES" ;; 
    10601060             --vanilla) VANILLA="YES" ;; 
    10611061             --portjail) JAILTYPE="portjail" ;; 
    1062              --pluginjail) JAILTYPE="pluginjail" ;;  
     1062             --pluginjail) JAILTYPE="pluginjail" ; VANILLA="YES" ;;  
    10631063             --linuxjail) JAILTYPE="linuxjail" ; shift 
    10641064                          if [ -z "$1" ] ; then exit_err "No linux setup script specified!"; fi 
     
    11081108          export IP4 
    11091109          export IP6 
    1110           export SOURCE  
     1110          export SRC 
    11111111          export PORTS 
    1112           export STARTUP 
     1112          export AUTOSTART 
    11131113          export JAILTYPE 
    11141114          export ARCHIVE_FILE 
Note: See TracChangeset for help on using the changeset viewer.