Merge "Change ssh variable in Ubuntu and remove masks"

This commit is contained in:
Zuul 2018-12-18 11:42:55 +00:00 committed by Gerrit Code Review
commit 482e3eb330
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