Commit bda06cfb authored by Guido Gunther's avatar Guido Gunther
Browse files

Merge branch 'no-sshd' into 'master'

No sshd

See merge request Librem5/image-builder!151
parents 3188b1f7 9c190f8c
......@@ -154,7 +154,7 @@ function cleanup_chroot()
{
chroot "${basedir}" apt-get clean
# Make sure we have DEP11 info
chroot "${basedir}" apt-get update
chroot "${basedir}" apt-get -y update
rm "${basedir}/etc/resolv.conf"
mv "${basedir}/etc/resolv.conf.bak" "${basedir}/etc/resolv.conf"
......@@ -215,7 +215,7 @@ function setup_journal()
function setup_sshd()
{
[ -x "${basedir}/usr/sbin/sshd" ] || return
[ -x "${basedir}/usr/sbin/sshd" ] || return 0
# Make sure unique host keys are generated on first boot
chroot "${basedir}" rm -f /etc/ssh/ssh_host_*
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment