From 99a0c974139b42237d7da17ee78cbb92616fadce Mon Sep 17 00:00:00 2001 From: Richard Laager Date: Sat, 23 May 2020 17:06:00 -0500 Subject: [PATCH] Debian/Ubuntu: Cleanup and update index pages Signed-off-by: Richard Laager --- docs/Getting Started/Debian/index.rst | 71 ++++++++++----------------- docs/Getting Started/Ubuntu/index.rst | 18 +++++-- 2 files changed, 41 insertions(+), 48 deletions(-) diff --git a/docs/Getting Started/Debian/index.rst b/docs/Getting Started/Debian/index.rst index 373f235..f29de62 100644 --- a/docs/Getting Started/Debian/index.rst +++ b/docs/Getting Started/Debian/index.rst @@ -1,77 +1,58 @@ +.. highlight:: sh + Debian ====== -`DKMS `__ -style packages are available from the `Debian GNU/Linux -repository `__ for the -following configurations. The packages previously hosted at -archive.zfsonlinux.org will not be updated and are not recommended for -new installations. - -**Debian Releases:** Stretch (oldstable), Buster (stable), and newer -(testing, sid) **Architectures:** amd64 - .. contents:: Table of Contents - :local: + :local: Installation ------------ -For Debian Buster, ZFS packages are included in the `contrib -repository `__. +If you want to use ZFS as your root filesystem, see the `Root on ZFS`_ +links below instead. -If you want to boot from ZFS, see -:doc:`Debian Buster Root on ZFS <./Debian Buster Root on ZFS>` -instead. -For troubleshooting existing installations on Stretch, see -:doc:`Debian Stretch Root on ZFS <./Debian Stretch Root on ZFS>`. +ZFS packages are included in the `contrib repository +`__. The +`backports repository `__ +often provides newer releases of ZFS. You can use it as follows. -The `backports -repository `__ often -provides newer releases of ZFS. You can use it as follows: +Add the backports repository:: -Add the backports repository: + vi /etc/apt/sources.list.d/buster-backports.list -:: +.. code-block:: sourceslist - # vi /etc/apt/sources.list.d/buster-backports.list deb http://deb.debian.org/debian buster-backports main contrib deb-src http://deb.debian.org/debian buster-backports main contrib - # vi /etc/apt/preferences.d/90_zfs - Package: libnvpair1linux libuutil1linux libzfs2linux libzpool2linux spl-dkms zfs-dkms zfs-test zfsutils-linux zfsutils-linux-dev zfs-zed - Pin: release n=buster-backports - Pin-Priority: 990 - -Update the list of packages: - :: - # apt update + vi /etc/apt/preferences.d/90_zfs -Install the kernel headers and other dependencies: +.. code-block:: control -:: + Package: libnvpair1linux libuutil1linux libzfs2linux libzpool2linux spl-dkms zfs-dkms zfs-test zfsutils-linux zfsutils-linux-dev zfs-zed + Pin: release n=buster-backports + Pin-Priority: 990 - # apt install --yes dpkg-dev linux-headers-$(uname -r) linux-image-amd64 +Install the packages:: -Install the zfs packages: - -:: - - # apt-get install zfs-dkms zfsutils-linux + apt update + apt install dpkg-dev linux-headers-$(uname -r) linux-image-amd64 + apt install zfs-dkms zfsutils-linux Root on ZFS ----------- .. toctree:: - :maxdepth: 1 - :glob: + :maxdepth: 1 + :glob: - *Root on ZFS + *Root on ZFS Related topics -------------- .. toctree:: - :maxdepth: 1 + :maxdepth: 1 - Debian GNU Linux initrd documentation \ No newline at end of file + Debian GNU Linux initrd documentation diff --git a/docs/Getting Started/Ubuntu/index.rst b/docs/Getting Started/Ubuntu/index.rst index 257add4..884812d 100644 --- a/docs/Getting Started/Ubuntu/index.rst +++ b/docs/Getting Started/Ubuntu/index.rst @@ -1,8 +1,20 @@ Ubuntu ====== -ZFS packages are `provided by the -distribution `__. +.. contents:: Table of Contents + :local: + +Installation +------------ + +If you want to use ZFS as your root filesystem, see the `Root on ZFS`_ +links below instead. + +Since Ubuntu 16.04, ZFS is included in the default Linux kernel packages. To +install the ZFS utilities:: + + apt update + apt install zfsutils-linux Root on ZFS ----------- @@ -10,4 +22,4 @@ Root on ZFS :maxdepth: 1 :glob: - * \ No newline at end of file + *