diff options
author | Will Fancher <elvishjerricco@gmail.com> | 2023-10-29 13:22:47 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-29 13:22:47 -0400 |
commit | 5cea7ee4527d3bbe2ba9675f9fb24c69d22c044d (patch) | |
tree | 9a91e2ca468a3119997c11b581f5919aaa48177a /nixos/modules/system | |
parent | b9d8a730e36e688df855c40c39498b658b46955f (diff) | |
parent | 22325ce016eeb59be10ce964e106549ac95c1896 (diff) | |
download | nixpkgs-5cea7ee4527d3bbe2ba9675f9fb24c69d22c044d.tar nixpkgs-5cea7ee4527d3bbe2ba9675f9fb24c69d22c044d.tar.gz nixpkgs-5cea7ee4527d3bbe2ba9675f9fb24c69d22c044d.tar.bz2 nixpkgs-5cea7ee4527d3bbe2ba9675f9fb24c69d22c044d.tar.lz nixpkgs-5cea7ee4527d3bbe2ba9675f9fb24c69d22c044d.tar.xz nixpkgs-5cea7ee4527d3bbe2ba9675f9fb24c69d22c044d.tar.zst nixpkgs-5cea7ee4527d3bbe2ba9675f9fb24c69d22c044d.zip |
Merge pull request #262583 from ElvishJerricco/systemd-stage-1-shells
systemd-stage-1: Support for user shells
Diffstat (limited to 'nixos/modules/system')
-rw-r--r-- | nixos/modules/system/boot/initrd-ssh.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index 60c5ff62fff..3df14030ab6 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -164,13 +164,12 @@ in for instructions. ''; } - - { - assertion = config.boot.initrd.systemd.enable -> cfg.shell == null; - message = "systemd stage 1 does not support boot.initrd.network.ssh.shell"; - } ]; + 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' + ''; + boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) '' copy_bin_and_libs ${package}/bin/sshd cp -pv ${pkgs.glibc.out}/lib/libnss_files.so.* $out/lib @@ -235,6 +234,8 @@ in users.sshd = { uid = 1; group = "sshd"; }; groups.sshd = { gid = 1; }; + users.root.shell = mkIf (config.boot.initrd.network.ssh.shell != null) config.boot.initrd.network.ssh.shell; + contents."/etc/ssh/authorized_keys.d/root".text = concatStringsSep "\n" config.boot.initrd.network.ssh.authorizedKeys; contents."/etc/ssh/sshd_config".text = sshdConfig; |