Merge lp:~ssd7/ubuntu/maverick/smartmontools/smartmontools-fix-491324 into lp:ubuntu/maverick/smartmontools

Proposed by Steven Danna
Status: Merged
Merged at revision: 20
Proposed branch: lp:~ssd7/ubuntu/maverick/smartmontools/smartmontools-fix-491324
Merge into: lp:ubuntu/maverick/smartmontools
Diff against target: 26 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
debian/smartmontools.init (+1/-1)
To merge this branch: bzr merge lp:~ssd7/ubuntu/maverick/smartmontools/smartmontools-fix-491324
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Pending
Review via email: mp+27670@code.launchpad.net

Description of the change

Small change to fix bug in init script.

To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

Hi Steven, thanks for this, it looks good.

One thing, did you create the changelog entry by hand? You missed
a space in the trailer line. Not a big issue, but you might find "dch"
from the devscripts package useful for automatically adding the boilerplate.

Thanks,

James

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-03-07 01:07:46 +0000
3+++ debian/changelog 2010-06-16 04:38:22 +0000
4@@ -1,3 +1,9 @@
5+smartmontools (5.38-3ubuntu4) maverick; urgency=low
6+
7+ * debian/smartmontools.init: Fix status message (LP: #491324)
8+
9+ -- Steven Danna <sdanna7@u.washington.edu> Wed, 16 Jun 2010 04:33:06 -0700
10+
11 smartmontools (5.38-3ubuntu3) lucid; urgency=low
12
13 * rebuild rest of main for armel armv7/thumb2 optimization;
14
15=== modified file 'debian/smartmontools.init'
16--- debian/smartmontools.init 2009-06-16 19:49:19 +0000
17+++ debian/smartmontools.init 2010-06-16 04:38:22 +0000
18@@ -127,7 +127,7 @@
19 fi
20 ;;
21 status)
22- status_of_proc -p $SMARTDPID $SMARTD smartd && exit 0 || exit $?
23+ status_of_proc -p $PIDFILE $DAEMON smartd && exit 0 || exit $?
24 ;;
25 *)
26 echo "Usage: /etc/init.d/smartmontools {start|stop|restart|reload|force-reload|status}"

Subscribers

People subscribed via source and target branches

to all changes: