nixos/stage-1.init.sh: Prevent unsafe remount and correct fstab syntax #358035
+10
−3
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
The legacy stage-1 generates the
/etc/fstab
from fsInfo but incorrectly adds a trailing,
character to the mount options. While does not appear to have caused any issue yet we should trim the trailing,
to be safe.Generated
/etc/fstab
during stage-1:stage-1 also currently remounts all fileSystems as a fix for busybox not respecting mount options on bind (and rbind) mount points. This results in a unintended errors during stage-1 if a file system such as NFS is mounted which does allow remounting with all of the original options present (i.e some options can only be set during the initial mount).
Error during stage-1 mounting NFS share:
Things done
Built and ran
legacyPackages.x86_64-linux.nixosTests.early-mount-options
.nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)