Merge lp:~3v1n0/bamf/safer-dbus-runner-xenial into lp:bamf/xenial

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Andrea Azzarone
Approved revision: 635
Merged at revision: 635
Proposed branch: lp:~3v1n0/bamf/safer-dbus-runner-xenial
Merge into: lp:bamf/xenial
Diff against target: 16 lines (+5/-1)
1 file modified
data/bamfdaemon-dbus-runner.in (+5/-1)
To merge this branch: bzr merge lp:~3v1n0/bamf/safer-dbus-runner-xenial
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Approve
Review via email: mp+295505@code.launchpad.net

Commit message

bamfdaemon-dbus-runner: don't try to start again if already running

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/bamfdaemon-dbus-runner.in'
--- data/bamfdaemon-dbus-runner.in 2015-11-19 09:44:40 +0000
+++ data/bamfdaemon-dbus-runner.in 2016-05-23 17:53:24 +0000
@@ -1,7 +1,11 @@
1#!/bin/bash1#!/bin/bash
22
3if [ -n "$UPSTART_SESSION" ]; then3if [ -n "$UPSTART_SESSION" ]; then
4 /sbin/initctl start bamfdaemon4 if ! (initctl status bamfdaemon | grep -q start); then
5 /sbin/initctl start bamfdaemon
6 else
7 echo "bamfdaemon job is already running..."
8 fi
5else9else
6 @PKGLIBEXECDIR@/bamfdaemon10 @PKGLIBEXECDIR@/bamfdaemon
7fi11fi

Subscribers

People subscribed via source and target branches