| 1 |
ssuominen 10/08/21 09:35:16 |
| 2 |
|
| 3 |
Added: consolekit-0.4.1-reorder-initialization.patch |
| 4 |
consolekit-0.4.1-nodaemon.patch |
| 5 |
Log: |
| 6 |
Don't take bus name until ready wrt #333349. Don't daemonize when activated. |
| 7 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-auth/consolekit/files/consolekit-0.4.1-reorder-initialization.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/consolekit/files/consolekit-0.4.1-reorder-initialization.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/consolekit/files/consolekit-0.4.1-reorder-initialization.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: consolekit-0.4.1-reorder-initialization.patch |
| 16 |
=================================================================== |
| 17 |
http://bugs.gentoo.org/333349 |
| 18 |
|
| 19 |
--- src/main.c |
| 20 |
+++ src/main.c |
| 21 |
@@ -331,11 +331,19 @@ |
| 22 |
|
| 23 |
setup_debug_log (debug); |
| 24 |
|
| 25 |
+ g_debug ("initializing console-kit-daemon %s", VERSION); |
| 26 |
+ |
| 27 |
connection = get_system_bus (); |
| 28 |
if (connection == NULL) { |
| 29 |
goto out; |
| 30 |
} |
| 31 |
|
| 32 |
+ manager = ck_manager_new (); |
| 33 |
+ |
| 34 |
+ if (manager == NULL) { |
| 35 |
+ goto out; |
| 36 |
+ } |
| 37 |
+ |
| 38 |
bus_proxy = get_bus_proxy (connection); |
| 39 |
if (bus_proxy == NULL) { |
| 40 |
g_warning ("Could not construct bus_proxy object; bailing out"); |
| 41 |
@@ -347,18 +355,10 @@ |
| 42 |
goto out; |
| 43 |
} |
| 44 |
|
| 45 |
- g_debug ("initializing console-kit-daemon %s", VERSION); |
| 46 |
- |
| 47 |
delete_console_tags (); |
| 48 |
|
| 49 |
create_pid_file (); |
| 50 |
|
| 51 |
- manager = ck_manager_new (); |
| 52 |
- |
| 53 |
- if (manager == NULL) { |
| 54 |
- goto out; |
| 55 |
- } |
| 56 |
- |
| 57 |
loop = g_main_loop_new (NULL, FALSE); |
| 58 |
|
| 59 |
g_signal_connect (bus_proxy, |
| 60 |
|
| 61 |
|
| 62 |
|
| 63 |
1.1 sys-auth/consolekit/files/consolekit-0.4.1-nodaemon.patch |
| 64 |
|
| 65 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/consolekit/files/consolekit-0.4.1-nodaemon.patch?rev=1.1&view=markup |
| 66 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/consolekit/files/consolekit-0.4.1-nodaemon.patch?rev=1.1&content-type=text/plain |
| 67 |
|
| 68 |
Index: consolekit-0.4.1-nodaemon.patch |
| 69 |
=================================================================== |
| 70 |
http://cgit.freedesktop.org/ConsoleKit/patch/?id=fc2870a65f6b3ed3b71bcac69c5faf3a9c759c64 |
| 71 |
http://bugs.freedesktop.org/show_bug.cgi?id=25642 |
| 72 |
|
| 73 |
--- data/org.freedesktop.ConsoleKit.service.in |
| 74 |
+++ data/org.freedesktop.ConsoleKit.service.in |
| 75 |
@@ -1,4 +1,4 @@ |
| 76 |
[D-BUS Service] |
| 77 |
Name=org.freedesktop.ConsoleKit |
| 78 |
-Exec=@sbindir@/console-kit-daemon |
| 79 |
+Exec=@sbindir@/console-kit-daemon --no-daemon |
| 80 |
User=root |
Archives