From 0a2125b845c149d4a82bdfe83bd17b7e92926d6a Mon Sep 17 00:00:00 2001 From: Richard Laager Date: Thu, 28 Oct 2021 22:07:00 -0500 Subject: [PATCH] Debian/Ubuntu: Improve some sudo usage Reported-by: Jonathan Dumont Signed-off-by: Richard Laager --- docs/Getting Started/Debian/Debian Buster Root on ZFS.rst | 4 ++-- .../Ubuntu/Ubuntu 20.04 Root on ZFS for Raspberry Pi.rst | 4 +++- docs/Getting Started/Ubuntu/Ubuntu 20.04 Root on ZFS.rst | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/docs/Getting Started/Debian/Debian Buster Root on ZFS.rst b/docs/Getting Started/Debian/Debian Buster Root on ZFS.rst index 11cdd53..843f581 100644 --- a/docs/Getting Started/Debian/Debian Buster Root on ZFS.rst +++ b/docs/Getting Started/Debian/Debian Buster Root on ZFS.rst @@ -1015,10 +1015,10 @@ Step 9: Final Cleanup If you installed SSH earlier, revert the temporary change:: - vi /etc/ssh/sshd_config + sudo vi /etc/ssh/sshd_config # Remove: PermitRootLogin yes - systemctl restart ssh + sudo systemctl restart ssh #. Optional: Re-enable the graphical boot process: diff --git a/docs/Getting Started/Ubuntu/Ubuntu 20.04 Root on ZFS for Raspberry Pi.rst b/docs/Getting Started/Ubuntu/Ubuntu 20.04 Root on ZFS for Raspberry Pi.rst index 3418ea9..769c679 100644 --- a/docs/Getting Started/Ubuntu/Ubuntu 20.04 Root on ZFS for Raspberry Pi.rst +++ b/docs/Getting Started/Ubuntu/Ubuntu 20.04 Root on ZFS for Raspberry Pi.rst @@ -514,8 +514,10 @@ Step 4: System Configuration For ZFS native encryption or LUKS:: + apt install --yes curl patch + curl https://launchpadlibrarian.net/478315221/2150-fix-systemd-dependency-loops.patch | \ - sed "s|/etc|/lib|;s|\.in$||" | (cd / ; sudo patch -p1) + sed "s|/etc|/lib|;s|\.in$||" | (cd / ; patch -p1) This patch is from `Bug #1875577 Encrypted swap won't load on 20.04 with zfs root diff --git a/docs/Getting Started/Ubuntu/Ubuntu 20.04 Root on ZFS.rst b/docs/Getting Started/Ubuntu/Ubuntu 20.04 Root on ZFS.rst index c284a58..05a2b20 100644 --- a/docs/Getting Started/Ubuntu/Ubuntu 20.04 Root on ZFS.rst +++ b/docs/Getting Started/Ubuntu/Ubuntu 20.04 Root on ZFS.rst @@ -911,10 +911,10 @@ Step 4: System Configuration For ZFS native encryption or LUKS:: - sudo apt install --yes curl patch + apt install --yes curl patch curl https://launchpadlibrarian.net/478315221/2150-fix-systemd-dependency-loops.patch | \ - sed "s|/etc|/lib|;s|\.in$||" | (cd / ; sudo patch -p1) + sed "s|/etc|/lib|;s|\.in$||" | (cd / ; patch -p1) This patch is from `Bug #1875577 Encrypted swap won't load on 20.04 with zfs root @@ -1153,10 +1153,10 @@ Step 8: Final Cleanup If you installed SSH earlier, revert the temporary change:: - vi /etc/ssh/sshd_config + sudo vi /etc/ssh/sshd_config # Remove: PermitRootLogin yes - systemctl restart ssh + sudo systemctl restart ssh #. Optional: Re-enable the graphical boot process: