Project

General

Profile

« Previous | Next » 

Revision 5e8aea0b

Added by Scott Ullrich almost 15 years ago

Misc changes to make ZFS installations work.

View differences:

PCBSD/pc-sysinstall/backend/functions-cleanup.sh
42 42 
    cat ${FSMNT}/etc/rc.conf 2>/dev/null | grep 'zfs_enable="YES"' >/dev/null 2>/dev/null
43 43 
    if [ "$?" != "0" ]
44 44 
    then
45 
      echo 'zfs_enable="YES"' >>${FSMNT}/etc/rc.conf
45 
      #echo 'zfs_enable="YES"' >>${FSMNT}/etc/rc.conf
46 46 
    fi
47 47 

  		




  48
  48
  
    
    sleep 2


  		




  ......




  73
  73
  
    
      do


  		




  74
  74
  
    
        if [ "${ZMNT}" != "/" ]


  		




  75
  75
  
    
        then


  		




  76
  
  
    
          rc_halt "zfs set mountpoint=${ZMNT} ${ZPOOLNAME}${ZMNT}"


  		




  77
  
  
    
          rc_halt "zfs unmount ${ZPOOLNAME}${ZMNT}"


  		




  78
  
  
    
          sleep 2


  		




  
  76
  
    
          #rc_halt "zfs set mountpoint=${ZMNT} ${ZPOOLNAME}${ZMNT}"


  		




  
  77
  
    
          #rc_halt "zfs unmount ${ZPOOLNAME}${ZMNT}"


  		




  
  78
  
    
          #sleep 2


  		




  79
  79
  
    
        fi


  		




  80
  80
  
    
      done 


  		




  81
  81
  
    
    fi


  		












  

    
      PCBSD/pc-sysinstall/backend/functions-unmount.sh
    
  





  90
  90
  
    
    # If are using a ZFS on "/" set it to legacy


  		




  91
  91
  
    
   if [ ! -z "${FOUNDZFSROOT}" ]


  		




  92
  92
  
    
   then


  		




  93
  
  
    
     rc_halt "zfs set mountpoint=legacy ${FOUNDZFSROOT}"


  		




  
  93
  
    
     #rc_halt "zfs set mountpoint=legacy ${FOUNDZFSROOT}"


  		




  94
  94
  
    
   fi


  		




  95
  95
  
    

  		




  96
  96
  
    
   # If we need to relabel "/" do it now


  		












Also available in:  Unified diff