diff options
author | Nikolay Amiantov <ab@fmap.me> | 2016-02-03 14:43:36 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2016-02-03 14:56:55 +0300 |
commit | 1d70e2fb7533ffa87120323257f9c6ea0c4c8c9c (patch) | |
tree | 0fd07157ff46d3985fd69c3ef989b0bbb38c4cfb /nixos/modules | |
parent | 815ff00ee0bf2ccbacaafbb601937686edb2c0a7 (diff) | |
download | nixlib-1d70e2fb7533ffa87120323257f9c6ea0c4c8c9c.tar nixlib-1d70e2fb7533ffa87120323257f9c6ea0c4c8c9c.tar.gz nixlib-1d70e2fb7533ffa87120323257f9c6ea0c4c8c9c.tar.bz2 nixlib-1d70e2fb7533ffa87120323257f9c6ea0c4c8c9c.tar.lz nixlib-1d70e2fb7533ffa87120323257f9c6ea0c4c8c9c.tar.xz nixlib-1d70e2fb7533ffa87120323257f9c6ea0c4c8c9c.tar.zst nixlib-1d70e2fb7533ffa87120323257f9c6ea0c4c8c9c.zip |
initrd modules: move passwd and nsswitch back to initrd-ssh
Partially reverts commit 901163c0c707d36323400394bf6e75adc4621e2f. This has broken remote SSH into initrd because ${cfg.shell} is not expanded. Also, nsswitch is useless without libnss_files.so which are installed by initrd-ssh.
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/system/boot/initrd-ssh.nix | 2 | ||||
-rw-r--r-- | nixos/modules/system/boot/stage-1-init.sh | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index 6809aefb7112..506e42bc024d 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -101,6 +101,8 @@ in mount -t devpts devpts /dev/pts echo '${cfg.shell}' > /etc/shells + echo 'root:x:0:0:root:/root:${cfg.shell}' > /etc/passwd + echo 'passwd: files' > /etc/nsswitch.conf mkdir -p /var/log touch /var/log/lastlog diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index c3d402eca042..95df0ace1ca4 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -72,11 +72,6 @@ mkdir -p /run mount -t tmpfs -o "mode=0755,size=@runSize@" tmpfs /run -# Initialise /etc. -echo 'root:x:0:0:root:/root:${cfg.shell}' > /etc/passwd -echo 'passwd: files' > /etc/nsswitch.conf - - # Process the kernel command line. export stage2Init=/init for o in $(cat /proc/cmdline); do |