summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2009-04-29 17:22:49 +0000
committerderaadt <deraadt@openbsd.org>2009-04-29 17:22:49 +0000
commit662bd1ec6c144fc00a8aeca8f974d56a8d14ce48 (patch)
tree1edc9d1e4cae29a0f1bf2481c4a623ed164f5d68
parentnew wpi-firmware package for iwlwifi-3945-ucode-15.32.2.9.tgz (diff)
downloadwireguard-openbsd-662bd1ec6c144fc00a8aeca8f974d56a8d14ce48.tar.xz
wireguard-openbsd-662bd1ec6c144fc00a8aeca8f974d56a8d14ce48.zip
Ask for the root password before sshd, because I have caught myself
twice now falling through the question because I am getting too used to hitting the return key...
-rw-r--r--distrib/miniroot/install.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh
index b4ce5c4a713..16320f882a8 100644
--- a/distrib/miniroot/install.sh
+++ b/distrib/miniroot/install.sh
@@ -1,5 +1,5 @@
#!/bin/ksh
-# $OpenBSD: install.sh,v 1.173 2009/04/28 21:41:03 deraadt Exp $
+# $OpenBSD: install.sh,v 1.174 2009/04/29 17:22:49 deraadt Exp $
# $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $
#
# Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback
@@ -345,11 +345,11 @@ sed -e "/^console.*on.*secure.*$/s/std\.[0-9]*/std.$(stty speed)/" \
# Move ttys back in case questions() needs to massage it more.
mv /tmp/ttys /mnt/etc/ttys
-questions
-
askpassword root
_rootpass="$_password"
+questions
+
user_setup
set_timezone