diff options
| author | Ricardo M. Correia <rcorreia@wizy.org> | 2014-02-19 17:13:21 +0100 |
|---|---|---|
| committer | Ricardo M. Correia <rcorreia@wizy.org> | 2014-02-19 17:18:50 +0100 |
| commit | a146fdab808ddacc2ea0b950d753807d75eae2db (patch) | |
| tree | 30084eb8052ab4f0dd5ceb3c9c5d07d99d08159b /nixos/modules/installer | |
| parent | cea9a1a242af60adb99e98a4eae50950dfd1ff92 (diff) | |
| download | nixlib-a146fdab808ddacc2ea0b950d753807d75eae2db.tar nixlib-a146fdab808ddacc2ea0b950d753807d75eae2db.tar.gz nixlib-a146fdab808ddacc2ea0b950d753807d75eae2db.tar.bz2 nixlib-a146fdab808ddacc2ea0b950d753807d75eae2db.tar.lz nixlib-a146fdab808ddacc2ea0b950d753807d75eae2db.tar.xz nixlib-a146fdab808ddacc2ea0b950d753807d75eae2db.tar.zst nixlib-a146fdab808ddacc2ea0b950d753807d75eae2db.zip | |
nixos-generate-config: Don't generate filesystem options
We don't want to hardcode configuration options that the current kernel chose for us when mounting the filesystem, since the defaults can change in the future.
Diffstat (limited to 'nixos/modules/installer')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-generate-config.pl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 67ba79560227..bf7cdcd37119 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -305,7 +305,15 @@ EOF fileSystems.\"$mountPoint\" = { device = \"$device\"; fsType = \"$fsType\"; - options = \"${\join ",", uniq(@extraOptions, @superOptions, @mountOptions)}\"; +EOF + + if (scalar @extraOptions > 0) { + $fileSystems .= <<EOF; + options = \"${\join ",", uniq(@extraOptions)}\"; +EOF + } + + $fileSystems .= <<EOF; }; EOF |