Merge lp:~mlankhorst/mir/setsid into lp:~mir-team/mir/trunk

[Maarten Lankhorst]

Fixes LP: #1195509

[Thomas Voß (thomas-voss)]

LGTM.

review: Approve

[Alexandros Frantzis (afrantzis)]

Looks good from a functionality perspective. Some style nits:

8 + if (activate) {

opening brace on its own line

10 + BOOST_THROW_EXCEPTION(
11 + boost::enable_error_info(
12 + std::runtime_error("Failed to stop being a process group"))
13 + << boost::errinfo_errno(errno));

17 + BOOST_THROW_EXCEPTION(
18 + boost::enable_error_info(
19 + std::runtime_error("Failed to become session leader"))
20 + << boost::errinfo_errno(errno));

Multi-line statements in 'if' clauses should be placed in curly braces.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:882
http://jenkins.qa.ubuntu.com/job/mir-ci/1094/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1430
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1315
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/332
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/332/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1094/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[lp:~mlankhorst/mir/setsid]

882. By Maarten Lankhorst on 2013-07-24

Fixes LP: #1195509. Fixes: https://bugs.launchpad.net/bugs/1195509.

Approved by Alexandros Frantzis, PS Jenkins bot, Thomas Voß.

=== modified file 'src/server/graphics/gbm/linux_virtual_terminal.cpp'
--- src/server/graphics/gbm/linux_virtual_terminal.cpp	2013-07-08 10:32:48 +0000
+++ src/server/graphics/gbm/linux_virtual_terminal.cpp	2013-07-24 13:26:27 +0000
@@ -186,6 +186,26 @@
 
     std::string const active_vt_path{vt_path_stream.str()};
 
+    if (activate)
+    {
+        if (getpid() == getpgid(0) && setpgid(0, getpgid(getppid())) < 0)
+        {
+            BOOST_THROW_EXCEPTION(
+                boost::enable_error_info(
+                    std::runtime_error("Failed to stop being a process group"))
+                       << boost::errinfo_errno(errno));
+        }
+
+        /* become process group leader */
+        if (setsid() < 0)
+        {
+            BOOST_THROW_EXCEPTION(
+                boost::enable_error_info(
+                    std::runtime_error("Failed to become session leader"))
+                       << boost::errinfo_errno(errno));
+        }
+    }
+
     auto vt_fd = fops->open(active_vt_path.c_str(), O_RDONLY | O_NDELAY);
 
     if (vt_fd < 0)