Changeset 75eb09a


Ignore:
Timestamp:
07/03/14 15:43:43 (14 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, enter/10, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2, releng/10.2
Children:
0bc29ff8
Parents:
4780d18
Message:

Fix two bugs with zfs restores, first ignore header lines on zfs props, second
don't try to recreate zfs symlink if it already exists

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

Legend:

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

    rad0dcb2 r75eb09a  
    238238  fi 
    239239  rc_halt "cp /boot/zfs/zpool.cache ${FSMNT}/boot/zfs/" 
    240   rc_halt "ln -s ../zfs ${FSMNT}/boot/kernel/zfs" 
     240 
     241  if [ ! -e "${FSMNT}/boot/kernel/zfs" ] ; then 
     242    rc_halt "ln -s ../zfs ${FSMNT}/boot/kernel/zfs" 
     243  fi 
    241244 
    242245  # Copy the hostid so that our zfs cache works 
  • src-sh/pc-sysinstall/backend/functions-zfsrestore.sh

    r69afc86 r75eb09a  
    152152      dChk="`echo $zLine | awk '{print $1}'`" 
    153153 
     154      # Remove header 
     155      echo "$zLine" | grep -q PROPERTY 
     156      if [ $? -eq 0 ] ; then continue ; fi 
     157 
    154158      # Don't need to set empty props 
    155159      if [ -z "$val" ] ; then continue ; fi 
Note: See TracChangeset for help on using the changeset viewer.