Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

nixos/stage-1-systemd: makeFstabEntries: drop rootPrefix parameter

Nick Cao 37cac5f0 0fecd7ed

+2 -4
+2 -4
nixos/modules/tasks/filesystems.nix
··· 187 187 skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck || isBindMount fs; 188 188 # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces 189 189 escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string; 190 - in fstabFileSystems: { rootPrefix ? "" }: concatMapStrings (fs: 190 + in fstabFileSystems: { }: concatMapStrings (fs: 191 191 (if fs.device != null then escape fs.device 192 192 else if fs.label != null then "/dev/disk/by-label/${escape fs.label}" 193 193 else throw "No device specified for mount point ‘${fs.mountPoint}’.") ··· 198 198 + "\n" 199 199 ) fstabFileSystems; 200 200 201 - initrdFstab = pkgs.writeText "initrd-fstab" (makeFstabEntries (filter utils.fsNeededForBoot fileSystems) { 202 - rootPrefix = "/sysroot"; 203 - }); 201 + initrdFstab = pkgs.writeText "initrd-fstab" (makeFstabEntries (filter utils.fsNeededForBoot fileSystems) { }); 204 202 205 203 in 206 204