Changeset ec4b304


Ignore:
Timestamp:
02/13/14 12:03:26 (5 months ago)
Author:
Kris Moore <kris@…>
Branches:
releng/10.0
Children:
bfa1eeb
Parents:
011295d
Message:

Some fixes when removing / unmounting a PBI container on 10.0

Location:
src-sh/pbi-manager
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pbi-manager/pbi-manager

    racf7a97 rec4b304  
    45394539        /usr/pbi/.pbime umount "/usr/pbi/.mounts/`basename $PBI_PROGDIRPATH`" 
    45404540 
     4541        # Give a few seconds before we nuke the dirs 
     4542        sleep 5 
     4543 
    45414544        get_username_from_file "${PBI_DBAPPDIR}/${PBI_DELETENAME}/pbi_name" 
    45424545        if [ "$FILEUSER" != `whoami` -a `id -u` != "0" ] ; then 
  • src-sh/pbi-manager/pbime/pbimount

    r011295d rec4b304  
    9797 
    9898   is_mounted "${pDir}/virtbase/dev" || (mount -t devfs devfs "${pDir}/virtbase/dev" ; $MNTSLEEP ) 
    99    is_mounted "${pDir}/virtbase/dev/fd" || (mount -t fdescfs fdesc "${pDir}/virtbase/dev/fd" ; $MNTSLEEP ) 
    10099   is_mounted "${pDir}/virtbase/usr/local" || ($NULLFS ${1}/local "${pDir}/virtbase/usr/local" ; $MNTSLEEP ) 
    101100   is_mounted "${pDir}/virtbase/var/run" || ($NULLFS ${pDir}/run "${pDir}/virtbase/var/run" ; $MNTSLEEP ) 
     
    157156 
    158157umount_pbidir() { 
    159    for i in `mount | grep "on ${pDir}/virtbase/usr/local" | tail -r | awk '{print $3}'` 
     158   for i in `mount | grep "on ${pDir}/virtbase" | tail -r | awk '{print $3}'` 
    160159   do 
    161160     #echo "Unmounting ${i}" 
    162      umount -f ${i} 
    163      sleep 0.5 
    164    done 
    165    for i in `mount | grep "on ${pDir}/virtbase/compat/linux" | tail -r | awk '{print $3}'` 
    166    do 
    167      #echo "Unmounting ${i}" 
    168      umount -f ${i} 
     161     umount ${i} 
    169162     sleep 0.5 
    170163   done 
Note: See TracChangeset for help on using the changeset viewer.