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

# Conflicts:
#	basic/root/.ssh/authorized_keys
This commit is contained in:
Disassembler 2017-06-23 16:10:53 +02:00
commit 076d70c3ab

View File

@ -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 apt-get --no-install-recommends -y install openssh-server
cp basic/root/.ssh/authorized_keys /root/.ssh/authorized_keys 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 # Rename encrypted partition
sed -i 's/sda2_crypt/system/' /etc/crypttab sed -i 's/sda2_crypt/system/' /etc/crypttab
dmsetup rename sda2_crypt system dmsetup rename sda2_crypt system