summaryrefslogtreecommitdiff
path: root/services
diff options
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2016-09-01 20:53:42 +0200
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2016-09-01 20:53:42 +0200
commitf0fd664f6c2e78598a264324ced18d327cdb1b4f (patch)
treeedcd4e086b2a311b805a51691a6c68c68f4fe0e9 /services
parent78dde8b3970eb281a0f1a1ceeffaf3e9b50bde30 (diff)
unity-panel-service-lockscreen.service: Set PreStart script multiline and work with no upstart there
(bzr r4153.9.48)
Diffstat (limited to 'services')
-rw-r--r--services/unity-panel-service-lockscreen.service.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/unity-panel-service-lockscreen.service.in b/services/unity-panel-service-lockscreen.service.in
index 4165b2b83..c5edf4c0b 100644
--- a/services/unity-panel-service-lockscreen.service.in
+++ b/services/unity-panel-service-lockscreen.service.in
@@ -3,6 +3,8 @@ Description=Backing Service for the Unity Panel in Lockscreen mode
PartOf=unity-screen-locked.target
[Service]
-ExecStartPre=/bin/sh -ec 'initctl status unity7 &> /dev/stdout | grep -vq "start/running"'
+ExecStartPre=/bin/sh -ec '\
+ status=$(initctl status unity7) || true;\
+ echo "$status" | grep -vq "start/running" || echo "Unity is managed by Upstart"'
ExecStart=@UNITY_LIBDIR@/unity-panel-service --lockscreen-mode
Restart=on-failure