From 2750fe088844ad239cea149c0607012e8c8f5948 Mon Sep 17 00:00:00 2001 From: Neil Williams Date: Thu, 11 Aug 2016 20:28:12 +0100 Subject: Enable systemd-resolved for jessie Fix custom package install to allow -y --- bin/vmdebootstrap | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/bin/vmdebootstrap b/bin/vmdebootstrap index cb98cd4..cc1efe1 100755 --- a/bin/vmdebootstrap +++ b/bin/vmdebootstrap @@ -320,11 +320,7 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth else: if self.settings['systemd-networkd']: network.systemd_support(rootdir) - if not distro.was_stable(datetime.date(2015, 4, 26)): - network.enable_systemd_resolved(rootdir) - else: - # /etc/network/interfaces.d/ - network.setup_networking(rootdir) + network.enable_systemd_resolved(rootdir) else: # /etc/network/interfaces.d/ network.setup_networking(rootdir) @@ -542,7 +538,7 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth logging.debug('stdout:\n%s', out) logging.debug('stderr:\n%s', err) out = runcmd(['chroot', rootdir, - 'apt-get', '-f', '--no-remove', 'install']) + 'apt-get', '-y', '-f', '--no-remove', 'install']) logging.debug('stdout:\n%s', out) shutil.rmtree(tmp) -- cgit v1.2.1