Unity Greeter

Merge lp:~pitti/unity-greeter/systemd-indicators into lp:unity-greeter

  1. systemd-indicators
  2. Merge into trunk
Proposed by Martin Pitt on 2016-10-26
Status: Merged
Merged at revision: 2051
Proposed branch: lp:~pitti/unity-greeter/systemd-indicators
Merge into: lp:unity-greeter
Diff against target: 88 lines (+12/-18)
3 files modified
debian/changelog (+7/-0)
debian/control (+2/-2)
src/unity-greeter.vala (+3/-16)
To merge this branch: bzr merge lp:~pitti/unity-greeter/systemd-indicators
Reviewer Review Type Date Requested Status
Robert Ancell 2016-10-26 Approve on 2016-10-26
Review via email: mp+309321@code.launchpad.net

Commit Message

* Move indicator launching from upstart to systemd.
* Depend on lightdm with the "no duplicate session D-Bus" fix.

Description of the Change

Start the indicators through their systemd user units instead of upstart.

To post a comment you must log in.
Robert Ancell (robert-ancell) wrote :

LGTM

review: Approve

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 2016-08-18 15:58:43 +0000
3+++ debian/changelog 2016-10-26 08:27:48 +0000
4@@ -1,3 +1,10 @@
5+unity-greeter (17.04.1) UNRELEASED; urgency=medium
6+
7+ * Move indicator launching from upstart to systemd.
8+ * Depend on lightdm with the "no duplicate session D-Bus" fix.
9+
10+ -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 25 Oct 2016 15:04:33 +0200
11+
12 unity-greeter (16.10.2.1) yakkety; urgency=medium
13
14 * Apply the Gtk.ResizeMode.QUEUE fix to another place, so that the shutdown
15
16=== modified file 'debian/control'
17--- debian/control 2016-08-02 19:23:54 +0000
18+++ debian/control 2016-10-26 08:27:48 +0000
19@@ -31,7 +31,7 @@
20 Architecture: any
21 Depends: ${misc:Depends},
22 ${shlibs:Depends},
23- upstart,
24+ systemd,
25 unity-settings-daemon (>= 15.04.1+16.10.20160615-0ubuntu1)
26 Recommends: indicator-application,
27 indicator-datetime,
28@@ -40,7 +40,7 @@
29 indicator-session,
30 indicator-sound,
31 network-manager-gnome,
32- lightdm,
33+ lightdm (>= 1.20.0-0ubuntu2~),
34 Suggests: lightdm-remote-session-freerdp,
35 lightdm-remote-session-uccsconfigure,
36 remote-login-service,
37
38=== modified file 'src/unity-greeter.vala'
39--- src/unity-greeter.vala 2016-05-27 09:14:01 +0000
40+++ src/unity-greeter.vala 2016-10-26 08:27:48 +0000
41@@ -508,7 +508,6 @@
42 Environment.set_variable ("GTK_MODULES", "atk-bridge", false);
43
44 Pid atspi_pid = 0;
45- Pid upstart_pid = 0;
46
47 try
48 {
49@@ -617,17 +616,17 @@
50 {
51 string[] argv;
52
53- Shell.parse_argv ("upstart --user --startup-event indicator-services-start", out argv);
54+ Shell.parse_argv ("systemctl --user start indicator-application indicator-power indicator-datetime indicator-keyboard indicator-session indicator-sound", out argv);
55 Process.spawn_async (null,
56 argv,
57 null,
58 SpawnFlags.SEARCH_PATH,
59 null,
60- out upstart_pid);
61+ null);
62 }
63 catch (Error e)
64 {
65- warning ("Error starting Upstart for indicators: %s", e.message);
66+ warning ("Error starting indicators: %s", e.message);
67 }
68
69 /* Make nm-applet hide items the user does not have permissions to interact with */
70@@ -655,18 +654,6 @@
71
72 debug ("Cleaning up");
73
74- if (upstart_pid != 0)
75- {
76- Posix.kill (upstart_pid, Posix.SIGTERM);
77- int status;
78- Posix.waitpid (upstart_pid, out status, 0);
79- if (Process.if_exited (status))
80- debug ("Upstart exited with return value %d", Process.exit_status (status));
81- else
82- debug ("Upstart terminated with signal %d", Process.term_sig (status));
83- upstart_pid = 0;
84- }
85-
86 if (atspi_pid != 0)
87 {
88 Posix.kill (atspi_pid, Posix.SIGKILL);

Subscribers

People subscribed via source and target branches