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: 5cb11abc9e7a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 598d79ae7d3d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 12, 2017

  1. nixos-install: quote nixos-prepare-root arguments 

    This prevents the script from breaking when channel_root is empty.
    @lheckemann
    lheckemann committed Jul 12, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    LnL7 Daiderd Jordan
    GPG key ID: D02435D05B810C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fa57005 View commit details

Commits on Jul 13, 2017

  1. Merge pull request #27341 from lheckemann/installer-fixes 

    nixos-install: quote nixos-prepare-root arguments
    @copumpkin
    copumpkin authored Jul 13, 2017
    Copy the full SHA
    598d79a View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/modules/installer/tools/nixos-install.sh
2 changes: 1 addition & 1 deletion nixos/modules/installer/tools/nixos-install.sh
View file
Original file line number Diff line number Diff line change
@@ -140,7 +140,7 @@ channel_closure="$tmpdir/channel.closure"
nix-store --export $channel_root > $channel_closure

# Populate the target root directory with the basics
@prepare_root@/bin/nixos-prepare-root $mountPoint $channel_root $system_root @nixClosure@ $system_closure $channel_closure
@prepare_root@/bin/nixos-prepare-root "$mountPoint" "$channel_root" "$system_root" @nixClosure@ "$system_closure" "$channel_closure"

# nixos-prepare-root doesn't currently do anything with file ownership, so we set it up here instead
chown @root_uid@:@nixbld_gid@ $mountPoint/nix/store