Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Ubuntu: Remove a merge marker 

I committed this accidentally.
Richard Laager 2016-09-27 16:14:49 -07:00
parent b9ce522b6d
commit 1d73801d3d
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Ubuntu-16.10-Root-on-ZFS.md

@ -69,7 +69,6 @@ Always use the long `/dev/disk/by-id/*` aliases with ZFS. Using the `/dev/sd*`
# zpool create -o ashift=12 \ # zpool create -o ashift=12 \
-O atime=off -O canmount=off -O compression=lz4 -O normalization=formD \ -O atime=off -O canmount=off -O compression=lz4 -O normalization=formD \
<<<<<<< HEAD
-O mountpoint=/ -R /mnt \ -O mountpoint=/ -R /mnt \
rpool /dev/disk/by-id/scsi-SATA_disk1-part1 rpool /dev/disk/by-id/scsi-SATA_disk1-part1