← Back to branch summary

~ubuntu-branches/ubuntu/raring/consolekit/raring

« back to all changes in this revision

Viewing changes to debian/patches/03-cleanup_console_tags.patch

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2010-11-20 18:17:28 UTC
  • mfrom: (0.1.16 sid)
  • Revision ID: james.westby@ubuntu.com-20101120181728-8e5bwe4ttgmk4j41
Tags: 0.4.3-2
https://launchpad.net/bugs/544139
Add 01-retry-console-open-on-EIO.patch: As reported in LP: #544139,
ConsoleKit sometimes fails to track the active VT. This particular case
was tracked down to a race condition that happens if you try to open
/dev/console while the current TTY is currently being closed. This yields
an -EIO error, in which case CK should just try again. Thanks Colin Watson
for the patch!

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/03-cleanup_console_tags.patch
2
2
 
3
3
Index: consolekit/src/main.c
4
4
===================================================================
5
 
--- consolekit.orig/src/main.c  2010-01-12 11:00:33.082306952 +0100
6
 
+++ consolekit/src/main.c       2010-01-12 11:00:34.346283038 +0100
7
 
@@ -149,6 +149,43 @@
 
5
--- consolekit.orig/src/main.c  2010-11-17 07:02:23.030817878 +0100
 
6
+++ consolekit/src/main.c       2010-11-17 07:03:17.434814872 +0100
 
7
@@ -148,6 +148,43 @@
8
8
         unlink (CONSOLE_KIT_PID_FILE);
9
9
 }
10
10
 
48
48
 /* copied from nautilus */
49
49
 static int debug_log_pipes[2];
50
50
 
51
 
@@ -229,7 +266,7 @@
 
51
@@ -228,7 +265,7 @@
52
52
                 snprintf (pid, sizeof (pid), "%lu\n", (long unsigned) getpid ());
53
53
                 written = write (pf, pid, strlen (pid));
54
54
                 close (pf);
57
57
         } else {
58
58
                 g_warning ("Unable to write pid file %s: %s",
59
59
                            CONSOLE_KIT_PID_FILE,
60
 
@@ -318,6 +355,8 @@
 
60
@@ -317,6 +354,8 @@
61
61
                 goto out;
62
62
         }
63
63