Changes in / [891636a:aa082fc8]


Ignore:
Location:
src-sh
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pc-sysinstall/backend/functions-extractimage.sh

    r1620346 r89c5083  
    5555      fi 
    5656      echo_log "pc-sysinstall: Starting Extraction (${di})" 
    57       tar -xpv -C ${FSMNT} -f ${DDIR}/${di}.txz ${TAROPTS} >&1 2>&1 
     57      tar -xpv -C ${FSMNT} ${TAROPTS} -f ${DDIR}/${di}.txz 2>&1 | tee -a ${FSMNT}/.tar-extract.log 
    5858      if [ $? -ne 0 ]; then 
     59        cd / 
     60        echo "TAR failure occurred:" >>${LOGOUT} 
     61        cat ${FSMNT}/.tar-extract.log | grep "tar:" >>${LOGOUT} 
    5962        exit_err "ERROR: Failed extracting the dist file: $di" 
    6063      fi 
  • src-sh/warden/bin/warden

    r1620346 re50ac20  
    3838Type in help <command> for information and usage about that command 
    3939 
    40   help - This help file" 
     40         help - This help file" 
    4141 
    4242if [ -e "${PROGDIR}/bin/warden-gui" ] ; then 
    43    echo "   gui - Launch the GUI menu" 
     43   echo "          gui - Launch the GUI menu" 
    4444fi 
    4545 
     
    5353       delete - Deletes a jail 
    5454       export - Exports a jail to a .wdn file 
     55        fstab - Start users \$EDITOR on jails custom fstab 
    5556          get - Gets options list for a jail 
    5657       import - Imports a jail from a .wdn file 
     
    465466}; 
    466467 
     468help_fstab() 
     469{ 
     470 title 
     471 echo "Help fstab 
     472 
     473Runs the users \$EDITOR on the jails custom fstab file. Can be used to setup 
     474nullfs mounts and others for a specific jail 
     475 
     476Usage: 
     477 
     478  warden fstab [hosts] 
     479" 
     480}; 
     481 
    467482help_import() 
    468483{ 
     
    615630           list) help_list ;; 
    616631           export) help_export ;; 
     632           fstab) help_fstab ;; 
    617633           import) help_import ;; 
    618634           pkgs) help_pkgs ;; 
     
    653669 
    654670         ${PROGDIR}/scripts/backend/listpbis.sh "${JAILNAME}"  
     671         ;; 
     672    fstab) JAILNAME="${2}" 
     673         if [ -z "${JAILNAME}" ]; then exit_err "No jail specified!"; fi 
     674         if [ ! -e "${JDIR}/${JAILNAME}" ]; then exit_err "No such jail!"; fi 
     675         set_warden_metadir 
     676         if [ ! -e "${JMETADIR}/fstab" ] ; then 
     677            echo "# Device      Mountpoint      FStype          Options Dump Pass" > ${JMETADIR}/fstab 
     678         fi 
     679         if [ -z "$EDITOR" ]; then EDITOR="vi"; fi 
     680         $EDITOR ${JMETADIR}/fstab 
     681         exit $? 
    655682         ;; 
    656683    get) require_root 
  • src-sh/warden/scripts/backend/startjail.sh

    r1620346 re50ac20  
    140140 
    141141  if [ -e "${JMETADIR}/jail-portjail" ] ; then mountjailxfs ${JAILNAME} ; fi 
     142fi 
     143 
     144# Check for user-supplied mounts 
     145if [ -e "${JMETADIR}/fstab" ] ; then 
     146   echo "Mounting user-supplied file-systems" 
     147   mount -a -F ${JMETADIR}/fstab 
    142148fi 
    143149 
  • src-sh/warden/scripts/backend/stopjail.sh

    r1620346 re50ac20  
    5555 
    5656if [ -e "${JMETADIR}/jail-linux" ] ; then LINUXJAIL="YES" ; fi 
     57 
     58# Check for user-supplied mounts 
     59if [ -e "${JMETADIR}/fstab" ] ; then 
     60   echo "Unmounting user-supplied file-systems" 
     61   umount -a -F ${JMETADIR}/fstab 
     62fi 
    5763 
    5864if [ "$LINUXJAIL" = "YES" ] ; then 
  • src-sh/warden/scripts/rc.d/shutdown.sh

    r1620346 r29c3581  
    2626for i in `ls -d .*.meta 2>/dev/null` 
    2727do 
    28   if [ ! -e "${i}/ip" ] ; then continue; fi 
    29   jIP="`cat ${i}/ip`" 
     28  JAILNAME=`echo ${i}|sed 's|.meta$||'|sed 's|^.||'` 
    3029 
    31   ${PROGDIR}/scripts/backend/checkstatus.sh "${jIP}" 2>/dev/null 
     30  ${PROGDIR}/scripts/backend/checkstatus.sh "${JAILNAME}" 2>/dev/null 
    3231  if [ "$?" = "0" ] ; then 
    33     echo "Stopping jail (${jIP})" 
    34     warden stop "${jIP}" "FAST" 
     32    echo "Stopping jail (${JAILNAME})" 
     33    warden stop "${JAILNAME}" "FAST" 
    3534  fi 
    3635done 
  • src-sh/warden/scripts/rc.d/startup.sh

    r1620346 r29c3581  
    2626for i in `ls -d .*.meta 2>/dev/null` 
    2727do 
    28   if [ -e "${i}/ip" -a -e "${i}/autostart" ] ; then 
    29    jIP=`cat ${i}/ip` 
    30    echo -e "Starting Jail (${jIP})...\c" 
    31    warden start "${jIP}" >/dev/null 2>/dev/null 
     28  if [ -e "${i}/id" -a -e "${i}/autostart" ] ; then 
     29   JAILNAME=`echo ${i}|sed 's|.meta$||'|sed 's|^.||'` 
     30   echo -e "Starting Jail (${JAILNAME})...\c" 
     31   warden start "${JAILNAME}" >/dev/null 2>/dev/null 
    3232   echo "Done" 
    3333  fi 
Note: See TracChangeset for help on using the changeset viewer.