From 8a4ed056956926ae18c75b7f0f83082f0936dcd5 Mon Sep 17 00:00:00 2001 From: Richard Laager Date: Wed, 2 Oct 2019 16:54:34 -0500 Subject: [PATCH] Revert "Debian: Add steps to patch zfs-initramfs" buster-backports has 0.8.2 now. This reverts commit c7722c835c525d513d3a2df41222351e4b146dc4, except that I kept the `apt update`, `apt dist-upgrade`, and `reboot` steps. --- Debian-Buster-Encrypted-Root-on-ZFS.md | 9 --------- Debian-Buster-Root-on-ZFS.md | 6 +----- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/Debian-Buster-Encrypted-Root-on-ZFS.md b/Debian-Buster-Encrypted-Root-on-ZFS.md index 836be8b..2e1397f 100644 --- a/Debian-Buster-Encrypted-Root-on-ZFS.md +++ b/Debian-Buster-Encrypted-Root-on-ZFS.md @@ -22,15 +22,6 @@ Apply updates: # apt update # apt dist-upgrade -Patch zfs-initramfs: - - # apt install curl - # curl https://github.com/zfsonlinux/zfs/commit/f335b8f.patch | \ - patch /usr/share/initramfs-tools/scripts/zfs - # update-initramfs -u -k all - -The patch fixes zfs-initramfs's Plymouth support for prompting for encryption passphrases. It is included in 0.8.2, so by the time of the next package update, the patch should not need to be reapplied. - Reboot: # reboot diff --git a/Debian-Buster-Root-on-ZFS.md b/Debian-Buster-Root-on-ZFS.md index 49aed4d..cc0c868 100644 --- a/Debian-Buster-Root-on-ZFS.md +++ b/Debian-Buster-Root-on-ZFS.md @@ -329,12 +329,8 @@ Even if you prefer a non-English system language, always ensure that `en_US.UTF- 4.6 Install ZFS in the chroot environment for the new system: - # apt install --yes curl dpkg-dev linux-headers-amd64 linux-image-amd64 + # apt install --yes dpkg-dev linux-headers-amd64 linux-image-amd64 # apt install --yes zfs-initramfs - # curl https://github.com/zfsonlinux/zfs/commit/f335b8f.patch | \ - patch /usr/share/initramfs-tools/scripts/zfs - -The patch fixes zfs-initramfs's Plymouth support for prompting for encryption passphrases. It is included in 0.8.2, so by the time of the next package update, the patch should not need to be reapplied. 4.7 For LUKS installs only, setup crypttab: