Changeset 9613aca


Ignore:
Timestamp:
11/06/14 13:59:59 (3 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.1.1
Children:
616aa28
Parents:
f2e6ffe
Message:

During installation we don't need to activate swap, this isn't
1998 anymore :P

File:
1 edited

Legend:

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

    r3018894 r9613aca  
    246246         UFS+J) mount_partition ${PARTDEV}${EXT}.journal ${PARTFS} ${PARTMNT} "async,noatime" ;; 
    247247         ZFS) mount_partition ${PARTDEV} ${PARTFS} ${PARTMNT} ;; 
    248          SWAP) 
    249  
    250                 if [ -n "$ZFS_SWAP_DEVS" ] ; then 
    251                   SWAPDEV="/dev/mirror/swapmirror" 
    252                 else 
    253                   SWAPDEV="$PARTDEV" 
    254                 fi 
    255  
    256                    # Lets enable this swap now 
    257            if [ "$PARTENC" = "ON" ] 
    258            then 
    259              echo_log "Enabling encrypted swap on ${SWAPDEV}" 
    260              rc_halt "geli onetime -d -e 3des ${SWAPDEV}" 
    261              sleep 5 
    262              rc_halt "swapon ${SWAPDEV}.eli" 
    263            else 
    264              echo_log "swapon ${SWAPDEV}" 
    265              sleep 5 
    266              rc_halt "swapon ${SWAPDEV}" 
    267             fi 
    268             ;; 
     248         SWAP) ;; 
    269249         IMAGE) 
    270250           if [ ! -d "${PARTMNT}" ] 
Note: See TracChangeset for help on using the changeset viewer.