Merge lp://qastaging/~jtv/maas/bug-1306335 into lp://qastaging/~maas-committers/maas/trunk
Proposed by
Jeroen T. Vermeulen
Status: | Merged |
---|---|
Approved by: | Jeroen T. Vermeulen |
Approved revision: | no longer in the source branch. |
Merged at revision: | 2257 |
Proposed branch: | lp://qastaging/~jtv/maas/bug-1306335 |
Merge into: | lp://qastaging/~maas-committers/maas/trunk |
Diff against target: |
32 lines (+10/-1) 2 files modified
etc/maas/templates/dhcp/dhcpd.conf.template (+1/-1) src/provisioningserver/dhcp/tests/test_config.py (+9/-0) |
To merge this branch: | bzr merge lp://qastaging/~jtv/maas/bug-1306335 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Julian Edwards (community) | Approve | ||
Review via email:
|
Commit message
Quote interface name in dhcpd.conf; required when the interface name contains dots (or perhaps other strange characters).
Description of the change
The unquoted version is treacherously accepted without complaints for “normal” names. To install, we can only assume, a false sense of security.
Jeroen
To post a comment you must log in.
The attempt to merge lp:~jtv/maas/bug-1306335 into lp:maas failed. Below is the output from the failed tests.
Ign http:// security. ubuntu. com trusty-security InRelease security. ubuntu. com trusty-security Release.gpg nova.clouds. archive. ubuntu. com trusty InRelease security. ubuntu. com trusty-security Release nova.clouds. archive. ubuntu. com trusty-updates InRelease nova.clouds. archive. ubuntu. com trusty Release.gpg nova.clouds. archive. ubuntu. com trusty-updates Release.gpg nova.clouds. archive. ubuntu. com trusty Release nova.clouds. archive. ubuntu. com trusty-updates Release security. ubuntu. com trusty- security/ main Sources security. ubuntu. com trusty- security/ universe Sources security. ubuntu. com trusty- security/ main amd64 Packages security. ubuntu. com trusty- security/ universe amd64 Packages security. ubuntu. com trusty- security/ main Translation-en security. ubuntu. com trusty- security/ universe Translation-en nova.clouds. archive. ubuntu. com trusty/main Sources nova.clouds. archive. ubuntu. com trusty/universe Sources nova.clouds. archive. ubuntu. com trusty/main amd64 Packages nova.clouds. archive. ubuntu. com trusty/universe amd64 Packages nova.clouds. archive. ubuntu. com trusty/main Translation-en security. ubuntu. com trusty- security/ main Translation-en_US nova.clouds. archive. ubuntu. com trusty/universe Translation-en security. ubuntu. com trusty- security/ universe Translation-en_US nova.clouds. archive. ubuntu. com trusty-updates/main Sources nova.clouds. archive. ubuntu. com trusty- updates/ universe Sources nova.clouds. archive. ubuntu. com trusty-updates/main amd64 Packages nova.clouds. archive. ubuntu. com trusty- updates/ universe amd64 Packages nova.clouds. archive. ubuntu. com trusty-updates/main Translation-en nova.clouds. archive. ubuntu. com trusty- updates/ universe Translation-en nova.clouds. archive. ubuntu. com trusty/main Translation-en_US nova.clouds. archive. ubuntu. com trusty/universe Translation-en_US nova.clouds. archive. ubuntu. com trusty-updates/main Translation-en_US nova.clouds. archive. ubuntu. com trusty- updates/ universe Translation-en_US FRONTEND= noninteractive apt-get -y \ no-install- recommends install apache2 bind9 bind9utils build-essential bzr-builddeb curl daemontools debhelper dh-apport distro-info dnsutils firefox freeipmi-tools ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make postgresql python-amqplib python-bzrlib python-celery python-convoy python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python- django- piston python-django-south python- djorm-ext- pgarray python-docutils python-formencode python-httplib2 python-jinja2 python-jsonschema python-lockfile python-lxml python-netaddr python-netifaces python-oauth python-oops python-oops-amqp python-oops-datedir-repo python-oops-twisted python-oops-wsgi python-pip p...
Hit http://
Ign http://
Hit http://
Ign http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Ign http://
Hit http://
Ign http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Ign http://
Ign http://
Ign http://
Ign http://
Reading package lists...
sudo DEBIAN_
--