diff options
| author | Nick Cao <nickcao@nichi.co> | 2023-09-27 18:31:05 -0400 |
|---|---|---|
| committer | Nick Cao <nickcao@nichi.co> | 2023-09-27 18:31:56 -0400 |
| commit | 37cac5f032f6da598eddde8dd49eb7a820d72ea3 (patch) | |
| tree | 18efc039cf6e0a58962d885ad973afe99a6c6b6c /nixos | |
| parent | 0fecd7edc884b5f397cb44fcaff88d52c34f3696 (diff) | |
| download | nixlib-37cac5f032f6da598eddde8dd49eb7a820d72ea3.tar nixlib-37cac5f032f6da598eddde8dd49eb7a820d72ea3.tar.gz nixlib-37cac5f032f6da598eddde8dd49eb7a820d72ea3.tar.bz2 nixlib-37cac5f032f6da598eddde8dd49eb7a820d72ea3.tar.lz nixlib-37cac5f032f6da598eddde8dd49eb7a820d72ea3.tar.xz nixlib-37cac5f032f6da598eddde8dd49eb7a820d72ea3.tar.zst nixlib-37cac5f032f6da598eddde8dd49eb7a820d72ea3.zip | |
nixos/stage-1-systemd: makeFstabEntries: drop rootPrefix parameter
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/tasks/filesystems.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 3f553948d78d..91e30aa4c0af 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -187,7 +187,7 @@ let skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck || isBindMount fs; # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string; - in fstabFileSystems: { rootPrefix ? "" }: concatMapStrings (fs: + in fstabFileSystems: { }: concatMapStrings (fs: (if fs.device != null then escape fs.device else if fs.label != null then "/dev/disk/by-label/${escape fs.label}" else throw "No device specified for mount point ‘${fs.mountPoint}’.") @@ -198,9 +198,7 @@ let + "\n" ) fstabFileSystems; - initrdFstab = pkgs.writeText "initrd-fstab" (makeFstabEntries (filter utils.fsNeededForBoot fileSystems) { - rootPrefix = "/sysroot"; - }); + initrdFstab = pkgs.writeText "initrd-fstab" (makeFstabEntries (filter utils.fsNeededForBoot fileSystems) { }); in |