Changeset d464bcc


Ignore:
Timestamp:
Jun 20, 2013 6:48:04 PM (10 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1
Children:
acdd4b9
Parents:
88e7386
Message:

Remove gnop trickery, conflicts with GRUB. We will need to look
into another method to set ashift=12

File:
1 edited

Legend:

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

    r1620346 rd464bcc  
    6363  # Check if we have some custom zpool arguments and use them if so 
    6464  if [ ! -z "${ZPOOLOPTS}" ] ; then 
    65     # Sort through devices and run gnop on them 
    66     local gnopDev="" 
    67     local newOpts="" 
    68     for i in $ZPOOLOPTS 
    69     do 
    70        echo "$i" | grep -q '/dev/' 
    71        if [ $? -eq 0 ] ; then 
    72           rc_halt "gnop create -S 4096 ${i}" 
    73           gnopDev="$gnopDev $i" 
    74           newOpts="$newOpts ${i}.nop" 
    75        else 
    76           newOpts="$newOpts $i" 
    77        fi 
    78     done 
    79      
    80     echo_log "Creating zpool ${ZPOOLNAME} with $newOpts" 
    81     rc_halt "zpool create -m none -f ${ZPOOLNAME} ${newOpts}" 
    82  
    83     # Export the pool 
    84     rc_halt "zpool export ${ZPOOLNAME}" 
    85  
    86     # Destroy the gnop devices 
    87     for i in $gnopDev 
    88     do 
    89        rc_halt "gnop destroy ${i}.nop" 
    90     done 
    91  
    92     # And lastly re-import the pool 
    93     rc_halt "zpool import ${ZPOOLNAME}" 
     65    echo_log "Creating zpool ${ZPOOLNAME} with $ZPOOLOPTS" 
     66    rc_halt "zpool create -m none -f ${ZPOOLNAME} ${ZPOOLOPTS}" 
    9467  else 
    95     # Lets do our pseudo-4k drive 
    96     rc_halt "gnop create -S 4096 ${PART}${EXT}" 
    97  
    9868    # No zpool options, create pool on single device 
    9969    echo_log "Creating zpool ${ZPOOLNAME} on ${PART}${EXT}" 
    100     rc_halt "zpool create -m none -f ${ZPOOLNAME} ${PART}${EXT}.nop" 
    101  
    102     # Finish up the gnop 4k trickery 
    103     rc_halt "zpool export ${ZPOOLNAME}" 
    104     rc_halt "gnop destroy ${PART}${EXT}.nop" 
    105     rc_halt "zpool import ${ZPOOLNAME}" 
     70    rc_halt "zpool create -m none -f ${ZPOOLNAME} ${PART}${EXT}" 
    10671  fi 
    10772 
    10873  # Disable atime for this zfs partition, speed increase 
    10974  rc_nohalt "zfs set atime=off ${ZPOOLNAME}" 
    110  
    111  
    11275 
    11376}; 
Note: See TracChangeset for help on using the changeset viewer.