summary refs log tree commit diff
diff options
context:
space:
mode:
authorJakub Sokołowski <jakub@status.im>2023-10-20 01:44:13 +0200
committerJakub Sokołowski <jakub@status.im>2023-10-20 01:44:13 +0200
commit26c4e35cea6ffdc21ab297c3d42e67eea87736f6 (patch)
tree3ebc6d200188b1bf02b2745e2afdf1168f6c3638
parentd042a296139c6a111be3e3d5dc9ef6783b5e7c16 (diff)
downloadnixpkgs-26c4e35cea6ffdc21ab297c3d42e67eea87736f6.tar
nixpkgs-26c4e35cea6ffdc21ab297c3d42e67eea87736f6.tar.gz
nixpkgs-26c4e35cea6ffdc21ab297c3d42e67eea87736f6.tar.bz2
nixpkgs-26c4e35cea6ffdc21ab297c3d42e67eea87736f6.tar.lz
nixpkgs-26c4e35cea6ffdc21ab297c3d42e67eea87736f6.tar.xz
nixpkgs-26c4e35cea6ffdc21ab297c3d42e67eea87736f6.tar.zst
nixpkgs-26c4e35cea6ffdc21ab297c3d42e67eea87736f6.zip
systemd: rename required AUTOFS4_FS to AUTOFS_FS
The `AUTOFS4_FS` name appears to be a legacy naming stub:

>Ok, I ran the script, and also decided that we might as well remove
>the AUTOFS4 legacy naming stub entry by now.
>
>It has been five years, and people will have either picked up the new
>name with 'make oldconfig', or they just don't use 'make oldconfig' at
>all.

https://lore.kernel.org/lkml/CAHk-=wgK9-Tx4BxYMrc0pg==mcaz3cjWF6-CBwVpM_BZAmf4JQ@mail.gmail.com/#r

That has been remove in 6.6 kernel and results in a failure:
```
error:
       Failed assertions:
       - CONFIG_AUTOFS4_FS is not enabled!
```

Signed-off-by: Jakub Sokołowski <jakub@status.im>
-rw-r--r--nixos/modules/system/boot/systemd.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 8e38072b4c6..68a8c1f37ed 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -575,7 +575,7 @@ in
     system.requiredKernelConfig = map config.lib.kernelConfig.isEnabled
       [ "DEVTMPFS" "CGROUPS" "INOTIFY_USER" "SIGNALFD" "TIMERFD" "EPOLL" "NET"
         "SYSFS" "PROC_FS" "FHANDLE" "CRYPTO_USER_API_HASH" "CRYPTO_HMAC"
-        "CRYPTO_SHA256" "DMIID" "AUTOFS4_FS" "TMPFS_POSIX_ACL"
+        "CRYPTO_SHA256" "DMIID" "AUTOFS_FS" "TMPFS_POSIX_ACL"
         "TMPFS_XATTR" "SECCOMP"
       ];