Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

filesystems: escape spaces in fstab with \040 #49354

Merged
merged 1 commit into from Nov 6, 2018
Merged

filesystems: escape spaces in fstab with \040 #49354

merged 1 commit into from Nov 6, 2018

Conversation

aanderse
Copy link
Member

Motivation for this change

Fix for #29273

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@aanderse aanderse mentioned this pull request Oct 28, 2018
Closed
Mic92
Mic92 reviewed Oct 28, 2018
View reviewed changes
nixos/tests/fstab.nix Outdated Show resolved Hide resolved
@aanderse aanderse force-pushed the fstab-escaping branch 3 times, most recently from f9b136e to 5625ab8 Compare October 29, 2018 00:49
@Mic92
Copy link
Member

Mic92 commented Oct 29, 2018

@GrahamcOfBorg test installer.zfsroot

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: tests.installer.zfsroot

Partial log (click to expand)

error: while evaluating anonymous function at /var/lib/gc-of-borg/nix-test-rs-8/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-8/nixos/release.nix:32:25, called from undefined position:
while evaluating 'hydraJob' at /var/lib/gc-of-borg/nix-test-rs-8/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-8/lib/customisation.nix:157:14, called from /var/lib/gc-of-borg/nix-test-rs-8/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-8/nixos/release.nix:32:28:
while evaluating the attribute 'drvPath' at /var/lib/gc-of-borg/nix-test-rs-8/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-8/lib/customisation.nix:174:13:
while evaluating the attribute 'drvPath' at /var/lib/gc-of-borg/nix-test-rs-8/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-8/lib/customisation.nix:141:13:
while evaluating the attribute 'buildCommand' of the derivation 'vm-test-run-installer-zfs-root' at /var/lib/gc-of-borg/nix-test-rs-8/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-8/pkgs/stdenv/generic/make-derivation.nix:178:11:
while evaluating the attribute 'testScript' of the derivation 'nixos-test-driver-installer-zfs-root' at /var/lib/gc-of-borg/nix-test-rs-8/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-8/pkgs/stdenv/generic/make-derivation.nix:178:11:
while evaluating 'isFunction' at /var/lib/gc-of-borg/nix-test-rs-8/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-8/lib/trivial.nix:231:16, called from /var/lib/gc-of-borg/nix-test-rs-8/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-8/nixos/lib/testing.nix:104:12:
while evaluating 'testScriptFun' at /var/lib/gc-of-borg/nix-test-rs-8/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-8/nixos/tests/installer.nix:65:19, called from /var/lib/gc-of-borg/nix-test-rs-8/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-8/nixos/tests/installer.nix:267:20:
Non-EFI boot methods are only supported on i686 / x86_64

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: tests.installer.zfsroot

Partial log (click to expand)

machine# [   32.832877] systemd-shutdown[1]: All loop devices detached.
machine# [   32.833694] systemd-shutdown[1]: Detaching DM devices.
machine# [   32.835719] ACPI: Preparing to enter system sleep state S5
machine# [   32.836566] reboot: Power down
collecting coverage data
syncing
test script finished in 559.81s
vde_switch: EOF on stdin, cleaning up and exiting
cleaning up
/nix/store/dk7da9yrmi1afg74ka3a6vkbgkzh4sn6-vm-test-run-installer-zfs-root

@aanderse
Copy link
Member Author

Given this is a bug fix will it make it back into 18.09 as well? Is there a well defined document on what gets into current release vs next?

@Mic92
Copy link
Member

Mic92 commented Oct 30, 2018

Yes it qualifies as such. Here is an rfc regarding backports: https://github.com/NixOS/rfcs/pull/29/files

@aanderse
Copy link
Member Author

aanderse commented Nov 6, 2018

@Mic92 Thanks for link. Looking forward to seeing that rfc finalized.

Let me know if there is anything else you need on this PR before merging.

@Mic92 Mic92 merged commit b2099d2 into NixOS:master Nov 6, 2018
@Mic92
Copy link
Member

Mic92 commented Nov 6, 2018

backport: 1c0d935

@aanderse
Copy link
Member Author

aanderse commented Nov 6, 2018

Thanks!

@aanderse aanderse deleted the fstab-escaping branch November 6, 2018 11:50
@aanderse aanderse mentioned this pull request Nov 11, 2018
Merged
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@aanderse @Mic92 @GrahamcOfBorg