Merge lp:~matsubara/maas/remove-ipmi-patch into lp:~maas-maintainers/maas/packaging

Proposed by Diogo Matsubara
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 129
Merged at revision: 129
Proposed branch: lp:~matsubara/maas/remove-ipmi-patch
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 32 lines (+0/-19)
2 files modified
debian/patches/99-ipmi-user-too-long.patch (+0/-18)
debian/patches/series (+0/-1)
To merge this branch: bzr merge lp:~matsubara/maas/remove-ipmi-patch
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Launchpad code reviewers Pending
Review via email: mp+128993@code.launchpad.net

Commit message

Remove 99-ipmi-user-too-long.patch as it was fixed upstream

Description of the change

This branch removes the 99-ipmi-user-too-long.patch from the packaging branch since it was fixed in upstream. Currently the recipe build is broken due to this.

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'debian/patches/99-ipmi-user-too-long.patch'
2--- debian/patches/99-ipmi-user-too-long.patch 2012-10-10 15:11:56 +0000
3+++ debian/patches/99-ipmi-user-too-long.patch 1970-01-01 00:00:00 +0000
4@@ -1,18 +0,0 @@
5-Description: IPMI user created on enlistment is too long
6- The IPMI user created on enlistment is too long causing that
7- the user is not created. Additionally, this will cause maas
8- to fail to power_on a machine.
9-Author: Andres Rodriguez <andreserl@ubuntu.com>
10-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1064832
11-
12---- maas-0.1+bzr1243+dfsg.orig/contrib/preseeds_v2/enlist_userdata 2012-10-09 17:19:17.000000000 -0400
13-+++ maas-0.1+bzr1243+dfsg/contrib/preseeds_v2/enlist_userdata 2012-10-10 00:58:16.355424942 -0400
14-@@ -143,7 +143,7 @@
15-
16- # create user/pass
17- if args.commission_creds:
18-- IPMI_MAAS_USER="maas-commissioning"
19-+ IPMI_MAAS_USER="maas-commission"
20- else:
21- IPMI_MAAS_USER="maas"
22- IPMI_MAAS_PASSWORD=generate_random_password()
23
24=== modified file 'debian/patches/series'
25--- debian/patches/series 2012-10-10 15:15:00 +0000
26+++ debian/patches/series 2012-10-10 16:33:43 +0000
27@@ -1,5 +1,4 @@
28 01-fix-database-settings.patch
29 02-pserv-config.patch
30 03-txlongpoll-config.patch
31-99-ipmi-user-too-long.patch
32 04-fix-ipmi-enlistment.patch

Subscribers

People subscribed via source and target branches