Merge lp://qastaging/~lamont/maas/bug-1651452 into lp://qastaging/~maas-committers/maas/trunk

Proposed by LaMont Jones
Status: Merged
Approved by: LaMont Jones
Approved revision: no longer in the source branch.
Merged at revision: 5615
Proposed branch: lp://qastaging/~lamont/maas/bug-1651452
Merge into: lp://qastaging/~maas-committers/maas/trunk
Diff against target: 53 lines (+21/-0)
2 files modified
src/provisioningserver/boot/tests/test_uefi_amd64.py (+4/-0)
src/provisioningserver/boot/uefi_amd64.py (+17/-0)
To merge this branch: bzr merge lp://qastaging/~lamont/maas/bug-1651452
Reviewer Review Type Date Requested Status
Mike Pontillo (community) Approve
Andres Rodriguez (community) Needs Fixing
Review via email: mp+313635@code.qastaging.launchpad.net

Commit message

Use correct escaping for kernel command line datasource_list.

Description of the change

Use correct escaping for kernel command line datasource_list.

To post a comment you must log in.
Revision history for this message
David Britton (dpb) wrote :

I applied this fix to a maas server with EFI hardware running 2.1.3 in ppa:maas/proposed, and it's working.

Revision history for this message
Andres Rodriguez (andreserl) wrote :

I think this will break pxelinux. So as per Blake on IRC, this needs to be EFI only.

review: Needs Fixing
Revision history for this message
LaMont Jones (lamont) wrote :

Now with uefi-only escaping.

Revision history for this message
Mike Pontillo (mpontillo) wrote :

I'm not clear on what this branch fixes and why it's fixing it the way it does. I fear future readers won't have a clue why we have a horrible mess of regex matching and substitution here, and will be tempted to remove it, at their peril. ;-)

Could you please add some comments explaining the "why" for this change, and with a link to the bug? I had hoped that the bug report would contain some triage information, but it's rather empty, so it's hard for a naive person to figure out the reasoning behind this branch.

Also, please add a docstring to the new Python function you added. =)

review: Needs Information
Revision history for this message
Mike Pontillo (mpontillo) wrote :

Looks great; thanks for adding that!

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

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

Get:1 http://security.ubuntu.com/ubuntu xenial-security InRelease [102 kB]
Hit:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease
Get:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease [102 kB]
Get:4 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease [102 kB]
Get:5 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/main amd64 Packages [442 kB]
Get:6 http://security.ubuntu.com/ubuntu xenial-security/main amd64 Packages [193 kB]
Fetched 942 kB in 0s (2,018 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 libnss-wrapper 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 already the newest version (3:6.03+dfsg-11ubuntu1).
python-formencode is already the newest version (1.3.0-0ubuntu5).
python-l...

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.