From 9bdad8779d4b0c162d0ccf0543d5c64a0aa5c78d Mon Sep 17 00:00:00 2001 From: Dmitriy Kholkin Date: Sat, 16 Sep 2023 00:49:54 +0300 Subject: [PATCH] use unstable zfs --- machines/AMD-Workstation/boot.nix | 4 +++- machines/Dell-Laptop/boot.nix | 4 +++- patches/zen-kernels.patch | 16 ---------------- scripts/gen-patch-zen.sh | 2 +- 4 files changed, 7 insertions(+), 19 deletions(-) diff --git a/machines/AMD-Workstation/boot.nix b/machines/AMD-Workstation/boot.nix index 793df7a..6120584 100644 --- a/machines/AMD-Workstation/boot.nix +++ b/machines/AMD-Workstation/boot.nix @@ -3,6 +3,9 @@ let zfs_arc_max = toString (6 * 1024 * 1024 * 1024); in { boot = { + zfs.enableUnstable = true; + kernelPackages = pkgs.linuxPackages_lqx; + initrd = { supportedFilesystems = [ "zfs" ]; luks.devices = { @@ -39,7 +42,6 @@ in { }; binfmt.emulatedSystems = [ "aarch64-linux" ]; - kernelPackages = pkgs.linuxPackages_lqx; kernelParams = [ "zfs.metaslab_lba_weighting_enabled=0" "zfs.zfs_arc_max=${zfs_arc_max}" diff --git a/machines/Dell-Laptop/boot.nix b/machines/Dell-Laptop/boot.nix index cdb023e..a9982de 100644 --- a/machines/Dell-Laptop/boot.nix +++ b/machines/Dell-Laptop/boot.nix @@ -3,6 +3,9 @@ let zfs_arc_max = toString (2 * 1024 * 1024 * 1024); in { boot = { + zfs.enableUnstable = true; + kernelPackages = pkgs.linuxPackages_lqx; + initrd = { supportedFilesystems = [ "zfs" ]; luks.devices = { @@ -35,7 +38,6 @@ in { generationsDir.copyKernels = true; }; - kernelPackages = pkgs.linuxPackages_lqx; kernelParams = [ "zfs.metaslab_lba_weighting_enabled=0" "zfs.zfs_arc_max=${zfs_arc_max}" diff --git a/patches/zen-kernels.patch b/patches/zen-kernels.patch index 7f10193..e69de29 100644 --- a/patches/zen-kernels.patch +++ b/patches/zen-kernels.patch @@ -1,16 +0,0 @@ -diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix -index 7c32a5d..708d613 100644 ---- a/pkgs/os-specific/linux/kernel/zen-kernels.nix -+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix -@@ -11,9 +11,9 @@ let - }; - # ./update-zen.py lqx - lqxVariant = { -- version = "6.4.7"; #lqx -+ version = "6.3.13"; #lqx - suffix = "lqx1"; #lqx -- sha256 = "055l8l83368858ap1pslxcs76hkms8ik627v7d7wczm9f1vldbln"; #lqx -+ sha256 = "1qxjbwmxlncfg6adrzrzjxnj8g4gcyq3k76i5fwlrfxx2s4hryl5"; #lqx - isLqx = true; - }; - zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/scripts/gen-patch-zen.sh b/scripts/gen-patch-zen.sh index 873f3ae..eafb4de 100755 --- a/scripts/gen-patch-zen.sh +++ b/scripts/gen-patch-zen.sh @@ -4,7 +4,7 @@ set -eu -o pipefail kCONFIG="$(pwd)" kNIXPKGS=$(nix flake metadata --json --inputs-from . nixpkgs | jq -r '.path') -kMAX_VER=`python $kCONFIG/scripts/find-latest-zfs-kernel.py $kNIXPKGS/pkgs/os-specific/linux/zfs/stable.nix` +kMAX_VER=`python $kCONFIG/scripts/find-latest-zfs-kernel.py $kNIXPKGS/pkgs/os-specific/linux/zfs/unstable.nix` echo "found version: $kMAX_VER"