commit efc72751729a5ade9e05aba264791bb44e65e7ab
author Viorel Suman <viorel.suman@intel.com> Mon Mar 21 10:23:43 2016 +0200
committer Viorel Suman <viorel.suman@intel.com> Mon Mar 21 11:21:19 2016 +0200
tree 464c847205df44caf2199d6b9e3e3f922725fb55
parent 922e151ba2d8e1036849b3882917b5aef2cb431c

Revert "Enable multiple consoles"

This reverts commit caafe5c6204bc2066e6201a67ecd7cd1b3f8d015.

Bug: None
Change-Id: Iea2a80003d996ce542393242f87dc658ac6d01c9
Tracked-On: https://jira01.devtools.intel.com/browse/BP-289
Signed-off-by: Viorel Suman <viorel.suman@intel.com>

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index e7bbf7b..bdecc32 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -172,7 +172,6 @@
 
 bool Service::HandleConsole(const std::vector<std::string>& args, std::string* err) {
     flags_ |= SVC_CONSOLE;
-    console_ = args.size() > 1 ? args[1] : DEFAULT_CONSOLE;
     return true;
 }
 
@@ -283,7 +282,7 @@
     constexpr std::size_t kMax = std::numeric_limits<std::size_t>::max();
     static const Map option_handlers = {
         {"class",       {1,     1,    &Service::HandleClass}},
-        {"console",     {0,     1,    &Service::HandleConsole}},
+        {"console",     {0,     0,    &Service::HandleConsole}},
         {"critical",    {0,     0,    &Service::HandleCritical}},
         {"disabled",    {0,     0,    &Service::HandleDisabled}},
         {"group",       {1,     NR_SVC_SUPP_GIDS + 1, &Service::HandleGroup}},
@@ -330,7 +329,7 @@
     }
 
     bool needs_console = (flags_ & SVC_CONSOLE);
-    if (needs_console && console_names.empty()) {
+    if (needs_console && !have_console) {
         ERROR("service '%s' requires console\n", name_.c_str());
         flags_ |= SVC_DISABLED;
         return false;
@@ -607,12 +606,10 @@
 }
 
 void Service::OpenConsole() const {
-    int fd = -1;
-    if (std::find(console_names.begin(), console_names.end(), console_) != console_names.end()) {
-        std::string c_path = "/dev/" + console_;
-        fd = open(c_path.c_str(), O_RDWR);
+    int fd;
+    if ((fd = open(console_name.c_str(), O_RDWR)) < 0) {
+        fd = open("/dev/null", O_RDWR);
     }
-    if (fd == -1) fd = open("/dev/null", O_RDWR);
     ioctl(fd, TIOCSCTTY, 0);
     dup2(fd, 0);
     dup2(fd, 1);