Commit Graph

277 Commits

Author SHA1 Message Date
Adam C. Stephens
b52452f8c7
Merge pull request #291951 from amarshall/zfs-pkgs-renaming
zfs: rename zfsStable -> zfs_2_2; zfsUnstable -> zfs_unstable; remove enableUnstable option in favor of package
2024-03-01 10:09:12 -05:00
Andrew Marshall
1f32eb724d nixos/zfs: Remove enableUnstable in favor of setting package
This just adds complexity and confusion. Once-upon-a-time, there was no
`package` and only `enableUnstable`, but now it is just confusing to
have both, as it would be possible to do e.g. `package = pkgs.zfs` and
`enableUnstable = true`, but then `enableUnstable` does nothing.
2024-02-27 19:30:19 -05:00
Andrew Marshall
929fcf9335 zfs_unstable: Rename from zfsUnstable
This matches the naming of other zfs_* pkgs.
2024-02-27 18:45:55 -05:00
Andrew Marshall
ce5b1e007e nixos/zfs: Fix typo in option doc 2024-02-27 18:45:55 -05:00
Alyssa Ross
45f1428902
zfs_2_1: 2.1.14 -> 2.1.15
This adds compatibility with newer kernels, which fixes
nixosTests.zfs.series_2_1, which broke when the default kernel version
was bumped.

This means we no longer need the removeLinuxDRM option at all, but
I've kept it around as a no-op so people can leave it set in case the
same thing happens again in future.
2024-02-27 13:44:16 +01:00
Alyssa Ross
2b9f043823
zfs: update latestCompatibleLinuxPackages
ZFS no longer tries to use GPL-only symbols on aarch64.

Tested by building nixosTests.zfs.stable (modified to use Linux 6.6)
and nixosTests.zfs.unstable.
2024-02-26 12:27:10 +01:00
pennae
258b935d70 nixos/filesystems: make supportedFilesystems an attrset
this lets us *dis*able filesystem explicitly, as is required by e.g. the
zfs-less installer images. currently that specifically is only easily
possible by adding an overlay that stubs out `zfs`, with the obvious
side-effect of also removing tooling that could run without the kernel
module loaded.
2024-02-19 11:46:52 +01:00
nikstur
1c1cfa073a nixos/filesystems: init overlayfs 2024-02-07 22:13:00 +01:00
Jörg Thalheim
559ddda570
Merge pull request #279852 from Madouura/pr/bcachefs
bcachefs: update comments, release-notes, only use IFS for bcachefs, update bcachefs-tools and module
2024-01-25 01:11:04 +01:00
Lassulus
65f1d64303
Merge pull request #279923 from jopejoe1/sshfs
nixos/filesystems: set `system.fsPackages` for sshfs
2024-01-24 22:04:41 +01:00
Madoura
c3316bcce4
nixos/bcachefs: add 'bcachefs-tools' to (udev/systemd).packages 2024-01-16 15:19:39 -06:00
Madoura
9dfa878a20
nixos/bcachefs: clarify 'FIXME' comment on when to remove 2024-01-16 15:06:05 -06:00
Will Fancher
c6f2b53e78
Merge pull request #280296 from ancathri/getKeyLocations-nosnapshots
nixos/zfs: fix getKeyLocations when listsnaps=on
2024-01-15 11:31:25 -05:00
ancathri
51dfaf639a nixos/zfs: fix getKeyLocations when listsnaps=on
Encountered boot errors in pool with `listsnapshots=on` getKeyLocations should ignore snapshots as they will not be well-handled by createImportService later on
2024-01-12 19:06:00 -06:00
Ryan Lahfa
724d5348a6
Merge pull request #272794 from dcarosone/zpool-import-d
nixos/zfs: check pool state with -d, like import
2024-01-12 20:07:24 +01:00
jopejoe1
df5728a4f4 nixos/filesystems: init sshfs 2024-01-10 00:24:48 +01:00
K900
ef190570b8 nixos/bcachefs: use linuxPackages_latest 2024-01-08 10:47:51 +03:00
Jörg Thalheim
db59d03371
Merge branch 'master' into pr/bcachefs 2024-01-07 11:40:30 +01:00
Luflosi
c71cb77cd6
nixos/grub: use the correct ZFS version
When `config.boot.zfs.enableUnstable` is set to true, grub was built with the `zfs` package even though the rest of the system uses the `zfsUnstable` package.
The effect of this can only be seen when `zfs` and `zfsUnstable` actually differ (which is not currently the case), for example when overriding one of them locally.
2023-12-29 01:53:27 +01:00
nikstur
c9569af3e0
Merge pull request #271326 from philiptaron/shutdown.target
treewide: depend on `shutdown.target` if `DefaultDependencies=no` in almost every case
2023-12-27 08:33:26 +01:00
pacien
cf6d89525f nixos/zed: use global sendmail if configured
This simplifies the setup to receive emails from the ZFS Event Daemon
by relying on the sendmail wrapper defined by other modules such as
msmtp or Postfix.

This is more similar to how other modules like smartd deal with email
configuration.

The user is no longer required to define and rebuild their own ZFS
package to add email support.

GitHub: closes https://github.com/NixOS/nixpkgs/issues/132464
2023-12-17 18:16:08 +01:00
Daniel Carosone
88f50101ac nixos/zfs: check pool state with -d, like import
This can avoid unnecessary wait-looping for pool to be 'ready' on some
systems when the paths don't match
2023-12-08 10:33:26 +11:00
Madoura
10207ea919
linux_testing_bcachefs: fully deprecate in favor of 'linux_testing'
Follow-up to https://github.com/NixOS/nixpkgs/pull/267640 for 23.11 post-release
2023-12-05 01:05:40 -06:00
Julien Malka
28608b0448 nixos/clevis: skip filesystem with null devices 2023-12-04 15:21:16 +00:00
Julien Malka
9b6b934949 nixos/clevis: guard zfs code behind config.clevis.boot.initrd.enable 2023-12-04 15:09:49 +00:00
Camille Mondon
27493b4d49 nixos/clevis: init
Co-Authored-By: Julien Malka <julien@malka.sh>
2023-12-02 11:55:47 +00:00
Philip Taron
e95b3d3915
nixos/zfs: ensure correct ordering w.r.t. shutdown.target 2023-11-30 15:34:52 -08:00
Philip Taron
d4f57da9e8
nixos/bcachefs: ensure correct ordering w.r.t. shutdown.target 2023-11-30 15:34:31 -08:00
Ryan Lahfa
58fdc495ed
Merge pull request #269452 from RaitoBezarius/zfs-superstable 2023-11-24 17:41:43 +01:00
Raito Bezarius
e04c0b0d99 zfs_2_1: init at 2.1.13
This re-introduces the old stable ZFS version we had in the past following
the many predicted issues of ZFS 2.2.x series, that is much more stable
than any further ZFS version at the moment.

I am also removing myself from maintenance of any further ZFS versions as I am
planning to quit ZFS maintenance at some point.

In the meantime, for users like me who depend on ZFS for critical operations, here is a ZFS version
that is known to work for LTS kernels.
2023-11-24 15:47:21 +01:00
Ryan Lahfa
d783b6040d
Merge pull request #269381 from YellowOnion/bcachefs 2023-11-23 16:53:22 +01:00
Finn Behrens
a51ea9ca17 nixos: fix bcachefs filesystem with symlinks 2023-11-23 08:14:27 +01:00
Daniel Hill
34a58ce86f bcachefs: fix lib.kernel.option miss use.
option is a function not a set.
2023-11-23 19:08:57 +13:00
Madoura
890cf0a79c
nixos/bcachefs: soft-deprecate 'linuxPackages_testing_bcachefs'
'bcachefs' is included in the linux kernel since 6.7-rc1
2023-11-18 09:58:51 -06:00
Madoura
0adbda28d3
nixos/bcachefs: remove 'with lib;' 2023-11-18 07:59:01 -06:00
github-actions[bot]
931938d1df
Merge master into staging-next 2023-10-30 18:01:02 +00:00
Will Fancher
cca22054c0 systemd-stage-1: Add assertions for unsupported options. 2023-10-30 12:15:58 +01:00
Vladimír Čunát
5c89ba8ab4
Merge branch 'master' into staging-next 2023-10-30 06:12:04 +01:00
Ryan Lahfa
a905c3a544
Merge pull request #262854 from ElvishJerricco/systemd-stage-1-bcachefs-decryption
systemd-stage-1: bcachefs decryption
2023-10-29 22:24:38 +01:00
github-actions[bot]
96132a216a
Merge master into staging-next 2023-10-26 18:01:02 +00:00
Cole Mickens
8c7908acc8
nixos/fs/vfat: fix inclusion in systemd stage1 2023-10-26 18:44:02 +02:00
Will Fancher
0425c4de6d systemd-stage-1: bcachefs decryption 2023-10-22 20:07:55 -04:00
github-actions[bot]
f4afba2014
Merge staging-next into staging 2023-10-21 18:01:53 +00:00
Ryan Lahfa
e6ade691a5
Merge pull request #259347 from ElvishJerricco/systemd-stage-1-zfs-sysusr-dependency
systemd 254: ZFS /usr fix with systemd-stage-1
2023-10-21 18:04:13 +01:00
github-actions[bot]
682b6995b4
Merge staging-next into staging 2023-10-21 12:01:45 +00:00
Will Fancher
18013cc71e systemd-stage-1: Use specific fs packages 2023-10-19 21:13:22 -04:00
Will Fancher
524714f7ea systemd 254: ZFS /usr fix with systemd-stage-1 2023-10-06 04:25:25 -04:00
Daniel Hill
d6bf8b47ec bcachefs: 2023-06-28 -> 2023-09-29
Includes prep work for mainline bcachefs release.
2023-10-03 22:00:26 +01:00
Artturin
696353fcf4 nixos/zfs: disable redundant scheduler
I (according to the comment) wrote this somewhere and since then it has
spread to many configs.

https://github.com/search?q=artturin+ENV%7BID_FS_TYPE%7D%3D%3D%22zfs_member%22%2C+ATTR%7B..%2Fqueue%2Fscheduler%7D%3D%22none%22&type=code

https://github.com/NixOS/nixpkgs/issues/169457#issuecomment-1523873402
2023-09-13 21:36:36 +02:00
Daniel Carosone
4ffc1c82c6 zfs: 'want', don't 'require', systemd-udev-settle
This completes changes in #227208
Fixes: #244737, #245089.
2023-07-28 16:57:12 +10:00