Merge "SUSE: Do not wipe DNS resolver entries from base image"
This commit is contained in:
commit
3f184d574c
@ -70,11 +70,6 @@ lxc_cache_map:
|
||||
zypper --gpg-auto-import-keys -n in --force-resolution -l {{ lxc_cache_distro_packages | join(' ') }}
|
||||
mkdir -p /var/backup
|
||||
chage -I -1 -d -1 -m 0 -M 99999 -E -1 root
|
||||
if [ -a /etc/resolv.conf.org ]; then
|
||||
mv /etc/resolv.conf.org /etc/resolv.conf
|
||||
else
|
||||
rm -f /etc/resolv.conf
|
||||
fi
|
||||
# NOTE(hwoarang): Enable sshd which has been explicitely disabled in
|
||||
# https://github.com/lxc/lxc-ci/commit/8dc7105399350a59698538a12b6d5a1a880ef2ba
|
||||
systemctl -q unmask sshd
|
||||
|
Loading…
x
Reference in New Issue
Block a user