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: 807a62e68ef0
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 2d7bce29d177
Choose a head ref
  • 5 commits
  • 2 files changed
  • 2 contributors

Commits on Jul 11, 2019

  1. nixos/install-grub: include child configs in grub menu 

    Add configs listed under the fine-tune subdirectory to the grub menu.
Use specified configuration name for the entry if available.
    @vmandela
    vmandela committed Jul 11, 2019
    Copy the full SHA
    7f363b0 View commit details
    Browse the repository at this point in the history

  2. nixos/tests: installer: restructure simple test data

    @vmandela
    vmandela committed Jul 11, 2019
    Copy the full SHA
    c400ab5 View commit details
    Browse the repository at this point in the history

  3. nixos/tests: installer: restructure simpleUefiGrub test data

    @vmandela
    vmandela committed Jul 11, 2019
    Copy the full SHA
    b08400a View commit details
    Browse the repository at this point in the history

  4. nixos/tests: add test for showing child configuration in grub menu 

    - Create a child configuration named "Work" with an extra config file.
- Name the default configuration as "Home" :-)
- Once the VM is setup, reboot and verify that it has booted into
default configuration.
- Reboot into the "Work" configuration via grub.
- Verify that we have booted into the "Work" configuration and that
the extra config file is present.

This test works for the simple grub configuration and simple UEFI
Grub configuration. UEFI Systemd is not included in the test.
    @vmandela
    vmandela committed Jul 11, 2019
    Copy the full SHA
    bc68f85 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2019

  1. nixos/install-grub: include child configs in grub menu (#45345) 

    nixos/install-grub: include child configs in grub menu
    @infinisil
    infinisil committed Jul 13, 2019
    Copy the full SHA
    2d7bce2 View commit details
    Browse the repository at this point in the history