summary refs log tree commit diff
path: root/nixos/modules/system
diff options
context:
space:
mode:
authorMaciej Krüger <mkg20001@gmail.com>2022-02-01 17:29:10 +0100
committerGitHub <noreply@github.com>2022-02-01 17:29:10 +0100
commit8bb7bec755775fd086d8dfe3ddbc128913e8dffa (patch)
tree553c9164c517e9ad8e9600018fd67fe2ad63129d /nixos/modules/system
parent0628dd529fdc01596525b6ddbfbba5162ff73689 (diff)
parent26a695399a0e8bc40c502655c3d147f1791e774f (diff)
downloadnixpkgs-8bb7bec755775fd086d8dfe3ddbc128913e8dffa.tar
nixpkgs-8bb7bec755775fd086d8dfe3ddbc128913e8dffa.tar.gz
nixpkgs-8bb7bec755775fd086d8dfe3ddbc128913e8dffa.tar.bz2
nixpkgs-8bb7bec755775fd086d8dfe3ddbc128913e8dffa.tar.lz
nixpkgs-8bb7bec755775fd086d8dfe3ddbc128913e8dffa.tar.xz
nixpkgs-8bb7bec755775fd086d8dfe3ddbc128913e8dffa.tar.zst
nixpkgs-8bb7bec755775fd086d8dfe3ddbc128913e8dffa.zip
Merge pull request #141122 from Luflosi/add-apfs-nixos-module
Diffstat (limited to 'nixos/modules/system')
-rw-r--r--nixos/modules/system/boot/stage-1-init.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index f86d4641228..8fcc1f02972 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -282,6 +282,9 @@ checkFS() {
     # Don't check resilient COWs as they validate the fs structures at mount time
     if [ "$fsType" = btrfs -o "$fsType" = zfs -o "$fsType" = bcachefs ]; then return 0; fi
 
+    # Skip fsck for apfs as the fsck utility does not support repairing the filesystem (no -a option)
+    if [ "$fsType" = apfs ]; then return 0; fi
+
     # Skip fsck for nilfs2 - not needed by design and no fsck tool for this filesystem.
     if [ "$fsType" = nilfs2 ]; then return 0; fi