Change ssh variable in Ubuntu and remove masks

The ssh service on ubuntu based systems is "ssh" which is established by
the service unit path `/lib/systemd/system/ssh.service`. When running
the service will respond to the name "sshd" however this is just an
alias.

The image prep task used to mask ssh after it was disabled. While
in practice thats OK, its really a little overkill and provides little
benifit. In prep the containers will have ssh disabled, but in the event
its needed it can be easily enabled wihout having to remember to unmask. 

Change-Id: I2edb3ca7cae6e05f15ab29b1d50ff1281762905e
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
This commit is contained in:
Kevin Carter 2018-11-21 13:00:51 -06:00 committed by Kevin Carter (cloudnull)
parent b2add64623
commit 27bef72fce
3 changed files with 4 additions and 4 deletions

View File

@ -38,7 +38,7 @@ rm -f /tmp/package-transaction.txt
rm -f /usr/bin/python || true
ln -s /usr/bin/python2.7 /usr/bin/python
for action in disable mask; do
for action in disable; do
systemctl ${action} sshd.service || true
done

View File

@ -39,7 +39,7 @@ zypper --gpg-auto-import-keys -n in --force-resolution -l {{ (nspawn_container_d
rm -f /usr/bin/python || true
ln -s /usr/bin/python2.7 /usr/bin/python
for action in disable mask; do
for action in disable; do
systemctl ${action} wicked.service || true
systemctl ${action} wickedd.service || true
systemctl ${action} wickedd-auto4.service || true

View File

@ -38,11 +38,11 @@ rm /var/cache/apt/archives/lock || true
rm -f /usr/bin/python || true
ln -s /usr/bin/python2.7 /usr/bin/python
for action in disable mask; do
for action in disable; do
systemctl ${action} resolvconf.service || true
systemctl ${action} systemd-networkd-resolvconf-update.path || true
systemctl ${action} systemd-networkd-resolvconf-update.service || true
systemctl ${action} sshd.service || true
systemctl ${action} ssh.service || true
done
systemctl enable systemd-hostnamed.service