Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Remove gnop trickery, conflicts with GRUB. We will need to look

into another method to set ashift=12
  • Loading branch information...
commit d464bcca8d181d81f2bfbd0acc9a4e1bdb990e07 1 parent 88e7386
@kmoore134 kmoore134 authored
Showing with 3 additions and 40 deletions.
  1. +3 −40 src-sh/pc-sysinstall/backend/functions-newfs.sh
View
43 src-sh/pc-sysinstall/backend/functions-newfs.sh
@@ -62,54 +62,17 @@ setup_zfs_filesystem()
# Check if we have some custom zpool arguments and use them if so
if [ ! -z "${ZPOOLOPTS}" ] ; then
- # Sort through devices and run gnop on them
- local gnopDev=""
- local newOpts=""
- for i in $ZPOOLOPTS
- do
- echo "$i" | grep -q '/dev/'
- if [ $? -eq 0 ] ; then
- rc_halt "gnop create -S 4096 ${i}"
- gnopDev="$gnopDev $i"
- newOpts="$newOpts ${i}.nop"
- else
- newOpts="$newOpts $i"
- fi
- done
-
- echo_log "Creating zpool ${ZPOOLNAME} with $newOpts"
- rc_halt "zpool create -m none -f ${ZPOOLNAME} ${newOpts}"
-
- # Export the pool
- rc_halt "zpool export ${ZPOOLNAME}"
-
- # Destroy the gnop devices
- for i in $gnopDev
- do
- rc_halt "gnop destroy ${i}.nop"
- done
-
- # And lastly re-import the pool
- rc_halt "zpool import ${ZPOOLNAME}"
+ echo_log "Creating zpool ${ZPOOLNAME} with $ZPOOLOPTS"
+ rc_halt "zpool create -m none -f ${ZPOOLNAME} ${ZPOOLOPTS}"
else
- # Lets do our pseudo-4k drive
- rc_halt "gnop create -S 4096 ${PART}${EXT}"
-
# No zpool options, create pool on single device
echo_log "Creating zpool ${ZPOOLNAME} on ${PART}${EXT}"
- rc_halt "zpool create -m none -f ${ZPOOLNAME} ${PART}${EXT}.nop"
-
- # Finish up the gnop 4k trickery
- rc_halt "zpool export ${ZPOOLNAME}"
- rc_halt "gnop destroy ${PART}${EXT}.nop"
- rc_halt "zpool import ${ZPOOLNAME}"
+ rc_halt "zpool create -m none -f ${ZPOOLNAME} ${PART}${EXT}"
fi
# Disable atime for this zfs partition, speed increase
rc_nohalt "zfs set atime=off ${ZPOOLNAME}"
-
-
};
# Runs newfs on all the partiions which we've setup with bsdlabel
Please sign in to comment.
Something went wrong with that request. Please try again.