Changeset 754b73a5


Ignore:
Timestamp:
05/07/13 09:08:56 (19 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, releng/10.1
Children:
1fbc840
Parents:
8245770
Message:

Be more verbose when we do unmounting / cleanup of installs

Don't try to umount the CDMNT variable when not installing from it

Location:
src-sh/pc-sysinstall/backend
Files:
2 edited

Legend:

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

    r1620346 r754b73a5  
    112112        mount | grep -q "${FSMNT}${ZMNT}" 
    113113        if [ $? -eq 0 ] ; then 
     114          echo_log "ZFS Unmount: ${ZPOOLNAME}${ZMNT}" 
     115          sleep 5 
    114116          rc_halt "zfs unmount ${ZPOOLNAME}${ZMNT}" 
    115117          rc_halt "zfs set mountpoint=${ZMNT} ${ZPOOLNAME}${ZMNT}" 
  • src-sh/pc-sysinstall/backend/functions-unmount.sh

    r1620346 r754b73a5  
    3535  for _ud in $_umntdirs 
    3636  do 
     37    echo_log "Unmounting: ${_ud}" 
     38    sleep 5 
    3739    umount -f ${_ud}  
    3840  done 
     
    9395    if [ "$PARTMNT" != "/" -a "${PARTMNT}" != "none" -a "${PARTFS}" != "ZFS" ] 
    9496    then 
     97      echo_log "Unmounting: ${PARTDEV}${EXT}" 
    9598      rc_halt "umount -f ${PARTDEV}${EXT}" 
    9699 
     
    126129  # Last lets the /mnt partition 
    127130  ######################################################### 
     131  echo_log "Unmounting: ${FSMNT}" 
    128132  rc_nohalt "umount -f ${FSMNT}" 
    129133 
     
    140144  fi 
    141145 
    142   # Unmount our CDMNT 
    143   rc_nohalt "umount -f ${CDMNT}" >/dev/null 2>/dev/null 
     146  # Check if we need to unmount a media 
     147  case $INSTALLMEDIUM in 
     148     dvd|usb) echo_log "Unmounting DVD/USB media: ${CDMNT}" 
     149              sleep 5 
     150              rc_nohalt "umount -f ${CDMNT}" >/dev/null 2>/dev/null 
     151              ;; 
     152           *) ;; 
     153  esac 
    144154 
    145155  # Check if we need to run any gmirror syncing 
Note: See TracChangeset for help on using the changeset viewer.