about summary refs log tree commit diff
path: root/nixpkgs/nixos/modules/services
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-01-05 09:43:56 +0000
committerAlyssa Ross <hi@alyssa.is>2021-01-06 12:48:30 +0000
commitaf6a975542c906db02e97e910759e3d4e3e83547 (patch)
treec3877ea9d50541e36c3e27545eb2b8214d155178 /nixpkgs/nixos/modules/services
parent32d4bb6ee0d67f5bf5b6489abc7cf7207dbd2ad5 (diff)
downloadnixlib-af6a975542c906db02e97e910759e3d4e3e83547.tar
nixlib-af6a975542c906db02e97e910759e3d4e3e83547.tar.gz
nixlib-af6a975542c906db02e97e910759e3d4e3e83547.tar.bz2
nixlib-af6a975542c906db02e97e910759e3d4e3e83547.tar.lz
nixlib-af6a975542c906db02e97e910759e3d4e3e83547.tar.xz
nixlib-af6a975542c906db02e97e910759e3d4e3e83547.tar.zst
nixlib-af6a975542c906db02e97e910759e3d4e3e83547.zip
modules/agetty: escape all arguments
Diffstat (limited to 'nixpkgs/nixos/modules/services')
-rw-r--r--nixpkgs/nixos/modules/services/ttys/agetty.nix17
1 files changed, 8 insertions, 9 deletions
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