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

Commits on Apr 23, 2020

  1. installer test: Fix grub extraConfig syntax 

    It looks like `terminal_output.serial` is incorrect, according to the
grub documentation:

https://www.gnu.org/software/grub/manual/grub/html_node/Serial-terminal.html

Related PR: #79406
    @benley
    benley committed Apr 23, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    Mic92 Jörg Thalheim
    GPG key ID: 003F2096411B5F92
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f09b8be View commit details

  2. Merge pull request #85832 from benley/benley/grub-serial 

    installer test: Fix grub extraConfig syntax
    @flokli
    flokli authored Apr 23, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    Mic92 Jörg Thalheim
    GPG key ID: 003F2096411B5F92
    Verified
    Learn about vigilant mode
    Copy the full SHA
    06a34e6 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/tests/installer.nix
2 changes: 1 addition & 1 deletion nixos/tests/installer.nix
View file
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ let
boot.loader.grub.splashImage = null;
''}
boot.loader.grub.extraConfig = "serial; terminal_output.serial";
boot.loader.grub.extraConfig = "serial; terminal_output serial";
${if grubUseEfi then ''
boot.loader.grub.device = "nodev";
boot.loader.grub.efiSupport = true;