diff options
| author | Will Fancher <elvishjerricco@gmail.com> | 2023-11-07 21:25:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-07 21:25:21 -0500 |
| commit | eaad9ece24133ec52ac19de315aa26e4acff6766 (patch) | |
| tree | c99743f9067eb00ace245ee2752f56a5724a6440 /nixos | |
| parent | 23a5f1f80dbc198c9a81ed0bea13f6be3b4b3689 (diff) | |
| parent | 03f089e11d1e73a54b510e1f3909bb20eb53aa0b (diff) | |
| download | nixlib-eaad9ece24133ec52ac19de315aa26e4acff6766.tar nixlib-eaad9ece24133ec52ac19de315aa26e4acff6766.tar.gz nixlib-eaad9ece24133ec52ac19de315aa26e4acff6766.tar.bz2 nixlib-eaad9ece24133ec52ac19de315aa26e4acff6766.tar.lz nixlib-eaad9ece24133ec52ac19de315aa26e4acff6766.tar.xz nixlib-eaad9ece24133ec52ac19de315aa26e4acff6766.tar.zst nixlib-eaad9ece24133ec52ac19de315aa26e4acff6766.zip | |
Merge pull request #266116 from ElvishJerricco/sd-s1-user-shells-fix-warning
nixos/initrd-ssh: Only warn about shell when using systemd initrd
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/initrd-ssh.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index 3df14030ab68..a8cd2e8f05fc 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -166,7 +166,7 @@ in } ]; - warnings = lib.optional (config.boot.initrd.systemd.enable -> cfg.shell != null) '' + warnings = lib.optional (config.boot.initrd.systemd.enable && cfg.shell != null) '' Please set 'boot.initrd.systemd.users.root.shell' instead of 'boot.initrd.network.ssh.shell' ''; |