talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge pull request #257693 from NickCao/bindmount

Browse Source 
nixos/stage-1-systemd: fix initrd-fstab generation for bind mounts, a…
This commit is contained in:
Will Fancher 2023-09-27 20:15:46 -04:00 committed by GitHub
commit 209f6f3c21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/modules/tasks/filesystems.nix
View File

@ -187,9 +187,8 @@ let
skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck || isBindMount fs; skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck || isBindMount fs;
# https://wiki.archlinux.org/index.php/fstab#Filepath_spaces # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces
escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string; escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string;
in fstabFileSystems: { rootPrefix ? "" }: concatMapStrings (fs: in fstabFileSystems: { }: concatMapStrings (fs:
(optionalString (isBindMount fs) (escape rootPrefix)) (if fs.device != null then escape fs.device
+ (if fs.device != null then escape fs.device
else if fs.label != null then "/dev/disk/by-label/${escape fs.label}" else if fs.label != null then "/dev/disk/by-label/${escape fs.label}"
else throw "No device specified for mount point ‘${fs.mountPoint}’.") else throw "No device specified for mount point ‘${fs.mountPoint}’.")
+ " " + escape fs.mountPoint + " " + escape fs.mountPoint
@ -199,9 +198,7 @@ let
+ "\n" + "\n"
) fstabFileSystems; ) fstabFileSystems;
initrdFstab = pkgs.writeText "initrd-fstab" (makeFstabEntries (filter utils.fsNeededForBoot fileSystems) { initrdFstab = pkgs.writeText "initrd-fstab" (makeFstabEntries (filter utils.fsNeededForBoot fileSystems) { });
rootPrefix = "/sysroot";
});
in in