summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkwadronaut <kwadronaut@leap.se>2015-11-20 08:44:24 +0100
committerkwadronaut <kwadronaut@leap.se>2015-11-20 08:44:24 +0100
commite8ffd7857395223cbc1af443424957884502a11f (patch)
treee04233c4b2824efa4cd0e1e200a6c717241e369a
parent06c98e8cdaddda13fa81d2bc975e0d887e7f4a25 (diff)
add root ssh login, do a safe-upgrade of packages jessie
-rw-r--r--definitions/jessie/base.sh14
-rw-r--r--definitions/jessie/preseed.cfg3
2 files changed, 13 insertions, 4 deletions
diff --git a/definitions/jessie/base.sh b/definitions/jessie/base.sh
index e07c289..48b90ef 100644
--- a/definitions/jessie/base.sh
+++ b/definitions/jessie/base.sh
@@ -7,13 +7,21 @@ apt-get -y install curl unzip vim tmux
# Set up sudo
echo 'vagrant ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/vagrant
-# jessie
-sed -i 's/PermitRootLogin yes/PermitRootLogin no/' /etc/ssh/sshd_config
-echo 'PasswordAuthentication no' >> /etc/ssh/sshd_config
+# LEAP still requires ssh-root login:
+
+# Either create a root password OR a user with sudo rights in the preseed
+echo 'root:vagrant' | sudo chpasswd
+
+echo 'PasswordAuthentication yes' >> /etc/ssh/sshd_config
+#echo 'PermitRootLogin yes' >> /etc/ssh/sshd_config
+sed -i 's/PermitRootLogin without-password/PermitRootLogin yes/' /etc/ssh/sshd_config
# Tweak sshd to prevent DNS resolution (speed up logins)
echo 'UseDNS no' >> /etc/ssh/sshd_config
+# reload sshd
+systemctl reload sshd
+
# Remove 5s grub timeout to speed up booting
cat <<EOF > /etc/default/grub
# If you change this file, run 'update-grub' afterwards to update
diff --git a/definitions/jessie/preseed.cfg b/definitions/jessie/preseed.cfg
index 7c84740..9d85633 100644
--- a/definitions/jessie/preseed.cfg
+++ b/definitions/jessie/preseed.cfg
@@ -224,7 +224,8 @@ d-i pkgsel/include string openssh-server ntp acpid sudo bzip2 rsync
# Whether to upgrade packages after debootstrap.
# Allowed values: none, safe-upgrade, full-upgrade
-d-i pkgsel/upgrade select none
+#d-i pkgsel/upgrade select none
+d-i pkgsel/upgrade select safe-upgrade
# Some versions of the installer can report back on what software you have
# installed, and what software you use. The default is not to report back,