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
base: 4fbea844332e
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 26c6ce6d52a1
Choose a head ref
  • 7 commits
  • 4 files changed
  • 1 contributor

Commits on Jan 4, 2017

  1. 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>
    aszlig committed Jan 4, 2017
    Configuration menu
    Copy the full SHA
    02765b4 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2017

  1. 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>
    aszlig committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    96bb3b1 View commit details
    Browse the repository at this point in the history
  2. 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>
    aszlig committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    9dca14e View commit details
    Browse the repository at this point in the history
  3. 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>
    aszlig committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    acc1c0b View commit details
    Browse the repository at this point in the history
  4. 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>
    aszlig committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    1531442 View commit details
    Browse the repository at this point in the history
  5. 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>
    aszlig committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    5ccda7b View commit details
    Browse the repository at this point in the history
  6. 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>
    aszlig committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    26c6ce6 View commit details
    Browse the repository at this point in the history