Changeset 04196c6


Ignore:
Timestamp:
05/15/14 10:58:50 (15 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, enter/10, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
eaea8ff
Parents:
0cc01c0
Message:

Allow installing to GELI without a seperate /boot dataset

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

Legend:

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

    r9174840 r04196c6  
    649649  fi 
    650650 
    651   if [ "${USINGENCROOT}" = "0" -a "${USINGBOOTPART}" != "0" ] 
    652   then 
    653     exit_err "ERROR: Can't encrypt (/) with no (/boot) partition!" 
    654   fi 
    655651}; 
    656652 
  • src-sh/pc-sysinstall/backend/functions-newfs.sh

    r8378d50 r04196c6  
    164164      if [ -e "${PARTDIR}-enc/${PART}-encpass" ] ; then 
    165165        # Using a passphrase 
    166         rc_halt "dd if=/dev/random of=${GELIKEYDIR}/${PART}.key bs=64 count=1" 
    167166        rc_halt "geli init -J ${PARTDIR}-enc/${PART}-encpass ${PARTDEV}" 
    168167        rc_halt "geli attach -j ${PARTDIR}-enc/${PART}-encpass ${PARTDEV}" 
Note: See TracChangeset for help on using the changeset viewer.