diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-08-01 21:09:34 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-08-01 21:09:34 +0200 |
| commit | 0e0dba4f698a71bfc98ad3bb0d9fa502852b8dd1 (patch) | |
| tree | 9bd8981d9117d27ea29f4d9aaea50182f6f73291 /modules/hardware | |
| parent | f19d8ca5f51d2ae4e4d5c7c78240c9f0222536de (diff) | |
hardware/t100ha: Revert bootloader workaround
This reverts commit 9d4575855bf1ae2136d85a2d0aa7b5ede50cfc67. The upstream issue systemd/systemd#3735 has been fixed and it got included in systemd version 331. Since NixOS/nixpkgs@51871dfb3777 we're also on version 331, so we no longer need this patch in Vuizvui. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'modules/hardware')
| -rw-r--r-- | modules/hardware/t100ha/default.nix | 10 | ||||
| -rw-r--r-- | modules/hardware/t100ha/fix-bootloader.patch | 20 |
2 files changed, 0 insertions, 30 deletions
diff --git a/modules/hardware/t100ha/default.nix b/modules/hardware/t100ha/default.nix index 29d0956e..46044d43 100644 --- a/modules/hardware/t100ha/default.nix +++ b/modules/hardware/t100ha/default.nix @@ -96,16 +96,6 @@ in { self = pkgs.linuxPackagesFor t100haKernel self; in self; - # Fix boot loader, otherwise it's hard (not impossible though if you press - # the key combinations fast enough) to choose anything else than the default - # entry. - # - # Upstream issue with workaround: - # https://github.com/systemd/systemd/issues/3632 - systemd.package = lib.overrideDerivation pkgs.systemd (drv: { - patches = (drv.patches or []) ++ [ ./fix-bootloader.patch ]; - }); - # By default the console is rotated by 90 degrees to the right. boot.kernelParams = [ "fbcon=rotate:3" ]; services.xserver.deviceSection = '' diff --git a/modules/hardware/t100ha/fix-bootloader.patch b/modules/hardware/t100ha/fix-bootloader.patch deleted file mode 100644 index 390bef44..00000000 --- a/modules/hardware/t100ha/fix-bootloader.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/boot/efi/console.c b/src/boot/efi/console.c -index c436f8b..586905e 100644 ---- a/src/boot/efi/console.c -+++ b/src/boot/efi/console.c -@@ -92,13 +92,8 @@ EFI_STATUS console_key_read(UINT64 *key, BOOLEAN wait) { - checked = TRUE; - } - -- /* wait until key is pressed */ -- if (wait) { -- if (TextInputEx) -- uefi_call_wrapper(BS->WaitForEvent, 3, 1, &TextInputEx->WaitForKeyEx, &index); -- else -- uefi_call_wrapper(BS->WaitForEvent, 3, 1, &ST->ConIn->WaitForKey, &index); -- } -+ if (wait) -+ uefi_call_wrapper(BS->WaitForEvent, 3, 1, &ST->ConIn->WaitForKey, &index); - - if (TextInputEx) { - EFI_KEY_DATA keydata; |