summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Williams <codehelp@debian.org>2016-08-11 20:28:12 +0100
committerNeil Williams <codehelp@debian.org>2016-08-11 20:28:12 +0100
commit2750fe088844ad239cea149c0607012e8c8f5948 (patch)
tree6cf50730170691b95898fd8fb84e3b5cb19edc7e
parent80759a16acfc5bfdf48c93e60372624415fe3647 (diff)
downloadvmdebootstrap-2750fe088844ad239cea149c0607012e8c8f5948.tar.gz
Enable systemd-resolved for jessie
Fix custom package install to allow -y
-rwxr-xr-xbin/vmdebootstrap8
1 files 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)