Merge lp:~serge-hallyn/ubuntu/natty/openipmi/lp473332 into lp:ubuntu/natty/openipmi

Proposed by Serge Hallyn
Status: Needs review
Proposed branch: lp:~serge-hallyn/ubuntu/natty/openipmi/lp473332
Merge into: lp:ubuntu/natty/openipmi
Diff against target: 57 lines (+12/-2)
4 files modified
debian/changelog (+7/-0)
debian/dirs (+1/-0)
debian/openipmi.init (+2/-2)
debian/rules (+2/-0)
To merge this branch: bzr merge lp:~serge-hallyn/ubuntu/natty/openipmi/lp473332
Reviewer Review Type Date Requested Status
Chuck Short (community) Approve
Review via email: mp+50169@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Chuck Short (zulcss) :
review: Approve

Unmerged revisions

19. By Serge Hallyn

Fix installation of /etc/default/openipmi

18. By Serge Hallyn

Fix up packaging to install and use /etc/default/openipmi
(LP: #473332)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-05-26 14:58:52 +0000
3+++ debian/changelog 2011-02-17 15:28:54 +0000
4@@ -1,3 +1,10 @@
5+openipmi (2.0.18-0ubuntu1defaults1) natty; urgency=low
6+
7+ * Fix up packaging to install and use /etc/default/openipmi
8+ (LP: #473332)
9+
10+ -- Serge Hallyn <serge.hallyn@ubuntu.com> Wed, 09 Feb 2011 16:43:17 -0600
11+
12 openipmi (2.0.18-0ubuntu1) maverick; urgency=low
13
14 * New upstream version.
15
16=== modified file 'debian/dirs'
17--- debian/dirs 2008-07-20 13:51:04 +0000
18+++ debian/dirs 2011-02-17 15:28:54 +0000
19@@ -1,2 +1,3 @@
20 usr/bin
21 usr/sbin
22+etc/default
23
24=== modified file 'debian/openipmi.init'
25--- debian/openipmi.init 2008-02-13 14:03:38 +0000
26+++ debian/openipmi.init 2011-02-17 15:28:54 +0000
27@@ -32,7 +32,7 @@
28 #############################################################################
29 . /lib/lsb/init-functions
30
31-CONFIGFILE=/etc/sysconfig/ipmi
32+CONFIGFILE=/etc/default/openipmi
33 # source config info
34 [ -r ${CONFIGFILE} ] && . ${CONFIGFILE}
35
36@@ -66,7 +66,7 @@
37 MODULES="${MODULES_INTERFACES} ${MODULES_FEATURES} ${MODULES_HW} ${MODULES_BASE}"
38
39 RETVAL=0
40-LOCKFILE=/var/lock/subsys/ipmi
41+LOCKFILE=/var/lock/ipmi
42 DEV_IPMI_TIMEOUT=15
43
44 UDEV_EXISTS=0
45
46=== modified file 'debian/rules'
47--- debian/rules 2009-11-05 12:52:52 +0000
48+++ debian/rules 2011-02-17 15:28:54 +0000
49@@ -92,6 +92,8 @@
50 # dh_installpam
51 # dh_installmime
52 dh_installinit -p openipmi --name openipmi --no-start -- defaults 21 20
53+ mv ipmi.sysconf openipmi
54+ dh_install openipmi etc/default
55 # dh_installcron
56 # dh_installinfo
57 dh_installman

Subscribers

People subscribed via source and target branches

to all changes: