Merge branch 'master' of infra.dasm.cz:/srv/git/hvezdolet

# Conflicts:
#	basic/root/.ssh/authorized_keys

basic.sh

@@ -7,6 +7,9 @@ apt-get -y purge bsdmainutils dictionaries-common emacsen-common gnupg gnupg-age
 apt-get --no-install-recommends -y install openssh-server
 cp basic/root/.ssh/authorized_keys /root/.ssh/authorized_keys
 
+# Copy authorized_keys
+cp basic/root/.ssh/authorized_keys /root/.ssh/authorized_keys
+
 # Rename encrypted partition
 sed -i 's/sda2_crypt/system/' /etc/crypttab
 dmsetup rename sda2_crypt system