Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 19091a517865
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b2099d21cfab
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 29, 2018

  1. filesystems: escape spaces in fstab with \040

    @aanderse
    aanderse committed Oct 29, 2018
    Copy the full SHA
    36d695f View commit details

Commits on Nov 6, 2018

  1. Merge pull request #49354 from aanderse/fstab-escaping 

    filesystems: escape spaces in fstab with \040
    @Mic92
    Mic92 authored Nov 6, 2018
    Copy the full SHA
    b2099d2 View commit details
Showing with 5 additions and 3 deletions.
  1. +5 −3 nixos/modules/tasks/filesystems.nix
8 changes: 5 additions & 3 deletions nixos/modules/tasks/filesystems.nix
View file
Original file line number Diff line number Diff line change
@@ -230,6 +230,8 @@ in
let
fsToSkipCheck = [ "none" "bindfs" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" ];
skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck;
# https://wiki.archlinux.org/index.php/fstab#Filepath_spaces
escape = string: builtins.replaceStrings [ " " ] [ "\\040" ] string;
in ''
# This is a generated file. Do not edit!
#
@@ -238,10 +240,10 @@ in
# Filesystems.
${concatMapStrings (fs:
(if fs.device != null then fs.device
else if fs.label != null then "/dev/disk/by-label/${fs.label}"
(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}’.")
+ " " + fs.mountPoint
+ " " + escape fs.mountPoint
+ " " + fs.fsType
+ " " + builtins.concatStringsSep "," fs.options
+ " 0"