diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-07-06 22:54:08 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-07-12 22:22:28 +0300 |
| commit | 90ad879753c476154e65667f8dec12cf5a6c89d4 (patch) | |
| tree | 2e77cd1f2abe220507aacea1e35ef47859bfa8d4 /nixos | |
| parent | 6e21246dc471a01fe8e8107292b5067234d20595 (diff) | |
| download | nixlib-90ad879753c476154e65667f8dec12cf5a6c89d4.tar nixlib-90ad879753c476154e65667f8dec12cf5a6c89d4.tar.gz nixlib-90ad879753c476154e65667f8dec12cf5a6c89d4.tar.bz2 nixlib-90ad879753c476154e65667f8dec12cf5a6c89d4.tar.lz nixlib-90ad879753c476154e65667f8dec12cf5a6c89d4.tar.xz nixlib-90ad879753c476154e65667f8dec12cf5a6c89d4.tar.zst nixlib-90ad879753c476154e65667f8dec12cf5a6c89d4.zip | |
nixos stage-1: unconditionally mount /dev/pts
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/initrd-ssh.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/system/boot/stage-1-init.sh | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index 3e2805a8c341..d0a4ce51148f 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -100,9 +100,6 @@ in ''; boot.initrd.network.postCommands = '' - mkdir /dev/pts - 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 diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 9bffcd31b9b4..055ad2e3e844 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -70,6 +70,8 @@ mount -t sysfs sysfs /sys mount -t devtmpfs -o "size=@devSize@" devtmpfs /dev mkdir -p /run mount -t tmpfs -o "mode=0755,size=@runSize@" tmpfs /run +mkdir /dev/pts +mount -t devpts devpts /dev/pts # Log the script output to /dev/kmsg or /run/log/stage-1-init.log. mkdir -p /tmp |