Comparing changes
Open a pull request
base repository: NixOS/nixpkgs
base: 4fbea844332e
head repository: NixOS/nixpkgs
compare: 26c6ce6d52a1
- 7 commits
- 4 files changed
- 1 contributor
Commits on Jan 4, 2017
-
nixos/storage/disk: Allow only one match method
Having multiple matchers is a bit tricky if we don't know how they should be combined. For example if we have a match on a label and a device name and both produce valid matches, which one should we choose? So let's restrict the use of device matchers to allow only one method right now. If we later figure out a better way how to combine these matchers, we can still lift this restriction easily. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Configuration menu - View commit details
-
Copy full SHA for 02765b4 - Browse repository at this point
Copy the full SHA 02765b4View commit details
Commits on Jan 5, 2017
-
nixos/tests/storage: Add subtest for matchers
We want to make sure that the options defined in disk.${name}.match are working. So we define a bunch of disks with all currently available matching methods and check afterwards if the devices get mounted. Of course the "check afterwards" part is solely theoretical because this is not yet supported in nixpart. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Configuration menu - View commit details
-
Copy full SHA for 96bb3b1 - Browse repository at this point
Copy the full SHA 96bb3b1View commit details -
nixos/storage/disk: Fix wording of allowIncomplete
Just remove the redundant "array", because RAID already includes array in the A. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Configuration menu - View commit details
-
Copy full SHA for 9dca14e - Browse repository at this point
Copy the full SHA 9dca14eView commit details -
nixos/tests/storage: Show stdout of nixpart -m
We want to know the messages printed to stdout regardless of whether nixpart -m has failed or not, primarily because it makes debugging easier (just adding "print(something)" should suffice). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Configuration menu - View commit details
-
Copy full SHA for acc1c0b - Browse repository at this point
Copy the full SHA acc1c0bView commit details -
nixos/tests/storage: Don't always check /mnt
So far we checked whether /mnt is a valid mountpoint during invocation of remountAndCheck. Now since we have the "matchers" sub test, we no longer have anything mounted directly in /mnt, so it doesn't make sense to check it unconditionally. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Configuration menu - View commit details
-
Copy full SHA for 1531442 - Browse repository at this point
Copy the full SHA 1531442View commit details -
nixos/tests/storage/matchers: Assign labels
We're basically destroying the initial information that's relevant for the matchers to actually match the corresponding devices, so we need those labels to find the newly created dummy ext4 file systems again. This also makes the definitions for fileSystems less redundant, because we now generate it using listToAttrs and genList. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Configuration menu - View commit details
-
Copy full SHA for 5ccda7b - Browse repository at this point
Copy the full SHA 5ccda7bView commit details -
nixpart: Update to latest master version
Adds support for mounting of file systems, which means that now the "btrfs", "ext" and "matchers" storage tests are succeeding. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Configuration menu - View commit details
-
Copy full SHA for 26c6ce6 - Browse repository at this point
Copy the full SHA 26c6ce6View commit details
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff 4fbea844332e...26c6ce6d52a1