Merge lp://staging/~lamont/maas/bug-1651452-2.1 into lp://staging/maas/2.1

Proposed by LaMont Jones
Status: Merged
Approved by: LaMont Jones
Approved revision: no longer in the source branch.
Merged at revision: 5572
Proposed branch: lp://staging/~lamont/maas/bug-1651452-2.1
Merge into: lp://staging/maas/2.1
Diff against target: 53 lines (+21/-0)
2 files modified
src/provisioningserver/boot/tests/ (+4/-0)
src/provisioningserver/boot/ (+17/-0)
To merge this branch: bzr merge lp://staging/~lamont/maas/bug-1651452-2.1
Reviewer Review Type Date Requested Status
LaMont Jones (community) Approve
Review via email:

Commit message

Backport r5615 from trunk: Properly format kernel command line for UEFI boot parsing.

Description of the change

Fix regression from Bug#1582323 -- UEFI requires those braces to be escaped, while pxeboot requires non-escaped.

To post a comment you must log in.
Revision history for this message
LaMont Jones (lamont) wrote :

Trivial backport

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :
Download full text (33.4 KiB)

The attempt to merge lp:~lamont/maas/bug-1651452-2.1 into lp:maas/2.1 failed. Below is the output from the failed tests.

Hit:1 xenial InRelease
Get:2 xenial-security InRelease [102 kB]
Get:3 xenial-updates InRelease [102 kB]
Get:4 xenial-backports InRelease [102 kB]
Get:5 xenial-updates/main Sources [212 kB]
Get:6 xenial-updates/main amd64 Packages [442 kB]
Get:7 xenial-updates/universe amd64 Packages [370 kB]
Fetched 1,331 kB in 0s (1,862 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind avahi-utils bash bind9 bind9utils build-essential bzr bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common isc-dhcp-server libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm postgresql pxelinux python3-all python3-apt python3-attr python3-bson python3-convoy python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-dnspython python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-netaddr python3-netifaces python3-novaclient python3-oauth python3-oauthlib python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-requests python3-seamicroclient python3-setuptools python3-simplestreams python3-sphinx python3-tempita python3-twisted python3-txtftp python3-tz python3-yaml python3-zope.interface python-bson python-crochet python-django python-django-piston python-djorm-ext-pgarray python-formencode python-lxml python-netaddr python-netifaces python-pocket-lint python-psycopg2 python-simplejson python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
authbind is already the newest version (2.1.1+nmu1).
avahi-utils is already the newest version (0.6.32~rc+dfsg-1ubuntu2).
build-essential is already the newest version (12.1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu3).
distro-info is already the newest version (0.14build1).
git is already the newest version (1:2.7.4-0ubuntu1).
libjs-angularjs is already the newest version (1.2.28-1ubuntu2).
libjs-jquery is already the newest version (1.11.3+dfsg-4).
libjs-yui3-full is already the newest version (3.5.1-1ubuntu3).
libjs-yui3-min is already the newest version (3.5.1-1ubuntu3).
make is already the newest version (4.1-6).
postgresql is already the newest version (9.5+173).
pxelinux is alrea...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.


People subscribed via source and target branches

to all changes: