summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlandry <landry@openbsd.org>2017-02-12 08:58:30 +0000
committerlandry <landry@openbsd.org>2017-02-12 08:58:30 +0000
commit69221f3c9b0402d08a13232a6de050209f53b618 (patch)
tree45f4f8380ab5c6962d4b4811cf02072a63d64e44
parentsync (add /root/.ssh & /root/.ssh/authorized_keys) (diff)
downloadwireguard-openbsd-69221f3c9b0402d08a13232a6de050209f53b618.tar.xz
wireguard-openbsd-69221f3c9b0402d08a13232a6de050209f53b618.zip
In autoinstall, no need to create /mnt/root/.ssh if the install script
provided an ssh public key, the directory is in the base set now. From tb@, discussed with rpe@ and tb@
-rw-r--r--distrib/miniroot/install.sub3
1 files changed, 1 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 6fa626a9e71..7af53220950 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
#!/bin/ksh
-# $OpenBSD: install.sub,v 1.969 2017/02/08 23:13:02 rpe Exp $
+# $OpenBSD: install.sub,v 1.970 2017/02/12 08:58:30 landry Exp $
#
# Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
# Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org>
@@ -2868,7 +2868,6 @@ do_install(){
# During autoinstall, add root user's public ssh key to authorized_keys.
[[ -n "$_rootkey" ]] && (
umask 077
- mkdir /mnt/root/.ssh
print -r -- "$_rootkey" >>/mnt/root/.ssh/authorized_keys
)