From 1d2ffe3528d75ead87734440444ed4b889e83aa8 Mon Sep 17 00:00:00 2001 From: George Melikov Date: Tue, 12 Jul 2022 21:37:24 +0300 Subject: [PATCH] Apt: use kernel/headers meta packages - `generic` packages exist since bullseye - older versions have `amd64` meta package --- docs/Developer Resources/Building ZFS.rst | 2 +- docs/Developer Resources/Custom Packages.rst | 2 +- docs/Getting Started/Debian/Debian Bullseye Root on ZFS.rst | 4 ++-- docs/Getting Started/Debian/Debian Buster Root on ZFS.rst | 3 +-- docs/Getting Started/Debian/Debian Stretch Root on ZFS.rst | 2 +- docs/Getting Started/Debian/index.rst | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/docs/Developer Resources/Building ZFS.rst b/docs/Developer Resources/Building ZFS.rst index 05f62d2..aa3700e 100644 --- a/docs/Developer Resources/Building ZFS.rst +++ b/docs/Developer Resources/Building ZFS.rst @@ -54,7 +54,7 @@ The following dependencies should be installed to build the latest ZFS .. code:: sh - sudo apt install build-essential autoconf automake libtool gawk alien fakeroot dkms libblkid-dev uuid-dev libudev-dev libssl-dev zlib1g-dev libaio-dev libattr1-dev libelf-dev linux-headers-$(uname -r) python3 python3-dev python3-setuptools python3-cffi libffi-dev python3-packaging git libcurl4-openssl-dev + sudo apt install build-essential autoconf automake libtool gawk alien fakeroot dkms libblkid-dev uuid-dev libudev-dev libssl-dev zlib1g-dev libaio-dev libattr1-dev libelf-dev linux-headers-generic python3 python3-dev python3-setuptools python3-cffi libffi-dev python3-packaging git libcurl4-openssl-dev Build Options ~~~~~~~~~~~~~ diff --git a/docs/Developer Resources/Custom Packages.rst b/docs/Developer Resources/Custom Packages.rst index 1f1375d..a2e9553 100644 --- a/docs/Developer Resources/Custom Packages.rst +++ b/docs/Developer Resources/Custom Packages.rst @@ -143,7 +143,7 @@ Make sure that the required packages are installed: .. code:: sh - sudo apt install build-essential autoconf automake libtool gawk alien fakeroot dkms libblkid-dev uuid-dev libudev-dev libssl-dev zlib1g-dev libaio-dev libattr1-dev libelf-dev linux-headers-$(uname -r) python3 python3-dev python3-setuptools python3-cffi libffi-dev python3-packaging + sudo apt install build-essential autoconf automake libtool gawk alien fakeroot dkms libblkid-dev uuid-dev libudev-dev libssl-dev zlib1g-dev libaio-dev libattr1-dev libelf-dev linux-headers-generic python3 python3-dev python3-setuptools python3-cffi libffi-dev python3-packaging `Get the source code <#get-the-source-code>`__. diff --git a/docs/Getting Started/Debian/Debian Bullseye Root on ZFS.rst b/docs/Getting Started/Debian/Debian Bullseye Root on ZFS.rst index 40b46ce..8e40693 100644 --- a/docs/Getting Started/Debian/Debian Bullseye Root on ZFS.rst +++ b/docs/Getting Started/Debian/Debian Bullseye Root on ZFS.rst @@ -184,7 +184,7 @@ Step 2: Disk Formatting mdadm --zero-superblock --force $DISK # For an array using a partition: mdadm --zero-superblock --force ${DISK}-part2 - + If the disk was previously used with zfs:: wipefs -a $DISK @@ -623,7 +623,7 @@ Step 4: System Configuration #. Install ZFS in the chroot environment for the new system:: - apt install --yes dpkg-dev linux-headers-amd64 linux-image-amd64 + apt install --yes dpkg-dev linux-headers-generic linux-image-generic apt install --yes zfs-initramfs 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 64c9d25..067d325 100644 --- a/docs/Getting Started/Debian/Debian Buster Root on ZFS.rst +++ b/docs/Getting Started/Debian/Debian Buster Root on ZFS.rst @@ -146,8 +146,7 @@ Step 1: Prepare The Install Environment #. Install ZFS in the Live CD environment:: - apt install --yes debootstrap gdisk dkms dpkg-dev \ - linux-headers-$(uname -r) + apt install --yes debootstrap gdisk dkms dpkg-dev linux-headers-amd64 apt install --yes -t buster-backports --no-install-recommends zfs-dkms diff --git a/docs/Getting Started/Debian/Debian Stretch Root on ZFS.rst b/docs/Getting Started/Debian/Debian Stretch Root on ZFS.rst index d50e71b..57a2929 100644 --- a/docs/Getting Started/Debian/Debian Stretch Root on ZFS.rst +++ b/docs/Getting Started/Debian/Debian Stretch Root on ZFS.rst @@ -130,7 +130,7 @@ connect with ``ssh user@IP``. :: - # apt install --yes debootstrap gdisk dkms dpkg-dev linux-headers-$(uname -r) + # apt install --yes debootstrap gdisk dkms dpkg-dev linux-headers-amd64 # apt install --yes -t stretch-backports zfs-dkms # modprobe zfs diff --git a/docs/Getting Started/Debian/index.rst b/docs/Getting Started/Debian/index.rst index 1bc7484..b3c4ff4 100644 --- a/docs/Getting Started/Debian/index.rst +++ b/docs/Getting Started/Debian/index.rst @@ -39,7 +39,7 @@ Add the backports repository:: Install the packages:: apt update - apt install dpkg-dev linux-headers-$(uname -r) linux-image-amd64 + apt install dpkg-dev linux-headers-generic linux-image-generic apt install zfs-dkms zfsutils-linux **Caution**: If you are in a poorly configured environment (e.g. certain VM or container consoles), when apt attempts to pop up a message on first install, it may fail to notice a real console is unavailable, and instead appear to hang indefinitely. To circumvent this, you can prefix the `apt install` commands with ``DEBIAN_FRONTEND=noninteractive``, like this::