From 1ad4accdafd29bd998f121dbda8f9c4e3df090b0 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 26 Jan 2020 15:10:34 +0100 Subject: [PATCH] systemd: drop 0027-Start-getty-on-lxc.patch Since quite some time, systemd starts getty on these consoles automatically. --- .../systemd/0027-Start-getty-on-lxc.patch | 27 ------------------- pkgs/os-specific/linux/systemd/default.nix | 1 - 2 files changed, 28 deletions(-) delete mode 100644 pkgs/os-specific/linux/systemd/0027-Start-getty-on-lxc.patch diff --git a/pkgs/os-specific/linux/systemd/0027-Start-getty-on-lxc.patch b/pkgs/os-specific/linux/systemd/0027-Start-getty-on-lxc.patch deleted file mode 100644 index 4c2777d3f03..00000000000 --- a/pkgs/os-specific/linux/systemd/0027-Start-getty-on-lxc.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f3a6f3056e69808ebbc7e72b1d03b85c750a3cae Mon Sep 17 00:00:00 2001 -From: Eelco Dolstra -Date: Wed, 16 Apr 2014 00:35:14 +0200 -Subject: [PATCH 27/27] Start getty on lxc - ---- - units/getty@.service.m4 | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/units/getty@.service.m4 b/units/getty@.service.m4 -index 80e793bb73..0daba10f2a 100644 ---- a/units/getty@.service.m4 -+++ b/units/getty@.service.m4 -@@ -31,7 +31,9 @@ Before=rescue.service - # On systems without virtual consoles, don't start any getty. Note - # that serial gettys are covered by serial-getty@.service, not this - # unit. --ConditionPathExists=/dev/tty0 -+ConditionPathExists=|/dev/tty0 -+ConditionVirtualization=|lxc -+ConditionVirtualization=|lxc-libvirt - - [Service] - # the VT is cleared by TTYVTDisallocate --- -2.24.1 - diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 7f43fa37b54..b8693678566 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -65,7 +65,6 @@ in stdenv.mkDerivation { ./0021-add-rootprefix-to-lookup-dir-paths.patch ./0022-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch ./0023-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch - ./0027-Start-getty-on-lxc.patch ]; outputs = [ "out" "lib" "man" "dev" ];