From af6a975542c906db02e97e910759e3d4e3e83547 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 5 Jan 2021 09:43:56 +0000
Subject: modules/agetty: escape all arguments

---
 nixpkgs/nixos/modules/services/ttys/agetty.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'nixpkgs/nixos/modules/services/ttys')

diff --git a/nixpkgs/nixos/modules/services/ttys/agetty.nix b/nixpkgs/nixos/modules/services/ttys/agetty.nix
index 996925134524..f9412d9ee898 100644
--- a/nixpkgs/nixos/modules/services/ttys/agetty.nix
+++ b/nixpkgs/nixos/modules/services/ttys/agetty.nix
@@ -5,18 +5,17 @@ with lib;
 let
   cfg = config.services.mingetty;
 
-  loginArgs = concatStringsSep " " [
-    "--login-program ${pkgs.shadow}/bin/login"
-
-    (optionalString (cfg.autologinUser != null)
-                    "--autologin ${cfg.autologinUser}")
-
-    (optionalString (cfg.loginOptions != null)
-                    "--login-options ${escapeShellArg cfg.loginOptions}")
+  loginArgs = [
+    "--login-program" "${pkgs.shadow}/bin/login"
+  ] ++ optionals (cfg.autologinUser != null) [
+    "--autologin" cfg.autologinUser
+  ] ++ optionals (cfg.loginOptions != null) [
+    "--login-options" cfg.loginOptions
   ];
 
   gettyCmd = extraArgs:
-    "@${pkgs.utillinux}/sbin/agetty agetty ${loginArgs} ${extraArgs}";
+    "@${pkgs.utillinux}/sbin/agetty agetty ${escapeShellArgs loginArgs} "
+      + extraArgs;
 
 in
 
-- 
cgit 1.4.1