local-lvm.adoc: s/not/note/

[pve-docs.git] / local-zfs.adoc

diff --git a/local-zfs.adoc b/local-zfs.adoc
index fab009336b9b1bfb9667564505b0c88e07288456..a75efcfb791b66503bfb1906c7053985c19cd092 100644 (file)
--- a/local-zfs.adoc
+++ b/local-zfs.adoc
@@ -1,6 +1,8 @@
 ZFS on Linux
 ------------
 ZFS on Linux
 ------------

-include::attributes.txt[]
+ifdef::wiki[]
+:pve-toplevel:
+endif::wiki[]

 
 ZFS is a combined file system and logical volume manager designed by
 Sun Microsystems. Starting with {pve} 3.4, the native Linux
 
 ZFS is a combined file system and logical volume manager designed by
 Sun Microsystems. Starting with {pve} 3.4, the native Linux


@@ -158,7 +160,7 @@ GRUB boot loader there. If you use a redundant RAID setup, it installs
 the boot loader on all disk required for booting. So you can boot
 even if some disks fail.
 
 the boot loader on all disk required for booting. So you can boot
 even if some disks fail.
 

-NOTE: It is not possible to use ZFS as root partition with UEFI
+NOTE: It is not possible to use ZFS as root file system with UEFI

 boot.
 
 
 boot.
 
 


@@ -242,7 +244,7 @@ As `<device>` it is possible to use more devices, like it's shown in
 If you have an pool without cache and log. First partition the SSD in
 2 partition with `parted` or `gdisk`
 
 If you have an pool without cache and log. First partition the SSD in
 2 partition with `parted` or `gdisk`
 

-IMPORTANT: Always use GPT partition tables (gdisk or parted).
+IMPORTANT: Always use GPT partition tables.

 
 The maximum size of a log device should be about half the size of
 physical memory, so this is usually quite small. The rest of the SSD
 
 The maximum size of a log device should be about half the size of
 physical memory, so this is usually quite small. The rest of the SSD


@@ -260,12 +262,19 @@ Activate E-Mail Notification
 
 ZFS comes with an event daemon, which monitors events generated by the
 ZFS kernel module. The daemon can also send emails on ZFS events like
 
 ZFS comes with an event daemon, which monitors events generated by the
 ZFS kernel module. The daemon can also send emails on ZFS events like

-pool errors.
+pool errors. Newer ZFS packages ships the daemon in a sparate package,
+and you can install it using `apt-get`:
+
+----
+# apt-get install zfs-zed
+----

 
 To activate the daemon it is necessary to edit `/etc/zfs/zed.d/zed.rc` with your
 favourite editor, and uncomment the `ZED_EMAIL_ADDR` setting:
 
 
 To activate the daemon it is necessary to edit `/etc/zfs/zed.d/zed.rc` with your
 favourite editor, and uncomment the `ZED_EMAIL_ADDR` setting:
 

+--------

 ZED_EMAIL_ADDR="root"
 ZED_EMAIL_ADDR="root"

+--------

 
 Please note {pve} forwards mails to `root` to the email address
 configured for the root user.
 
 Please note {pve} forwards mails to `root` to the email address
 configured for the root user.


@@ -312,7 +321,9 @@ run into low memory situations. Additionally, you can lower the
 To make the swappiness persistent, open `/etc/sysctl.conf` with
 an editor of your choice and add the following line:
 
 To make the swappiness persistent, open `/etc/sysctl.conf` with
 an editor of your choice and add the following line:
 

- vm.swappiness = 10
+--------
+vm.swappiness = 10
+--------

 
 .Linux kernel `swappiness` parameter values
 [width="100%",cols="<m,2d",options="header"]
 
 .Linux kernel `swappiness` parameter values
 [width="100%",cols="<m,2d",options="header"]