Merge lp:~jtv/maas/bug-1373103 into lp:~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: | 3072 |
Proposed branch: | lp:~jtv/maas/bug-1373103 |
Merge into: | lp:~maas-committers/maas/trunk |
Diff against target: |
142 lines (+31/-12) 3 files modified
src/maasserver/preseed.py (+9/-0) src/maasserver/tests/test_preseed.py (+19/-11) src/maasserver/views/nodes.py (+3/-1) |
To merge this branch: | bzr merge lp:~jtv/maas/bug-1373103 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Blake Rouse (community) | Needs Fixing | ||
Raphaël Badin (community) | Approve | ||
Review via email: mp+235739@code.launchpad.net |
Commit message
Install/run network configuration script only on Ubuntu. Installing it through curtin and then running it through curtin doesn't seem to work on other operating systems, even CentOS: for some reason the file is not found.
Description of the change
Unfortunately I can't Q/A this with full precision because of bug 1373207. I'm trying it out by hand-editing the code on a test machine.
Jeroen
To post a comment you must log in.
Okay, I understand it is quite urgent to fix this so I'm approving this MP.
It's probably worth adding a little note to state that this is a temporary fix because it's really ugly as it stands.
Not trying to configure the interfaces if the file is not present might be a better fix.
In any case, if it wasn't temporary, this code would really belong to the OS code.