[systemd-commits] 2 commits - src/manager.c src/systemctl.c src/util.c

[Lennart Poettering]

 src/manager.c   |    4 ++--
 src/systemctl.c |    2 +-
 src/util.c      |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit fe71c02cf5aefad46e6662b2bbdf744975b43991
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Sep 1 00:32:32 2010 +0200

    manager: reword some error messages regarding "logs"
    
    https://bugzilla.redhat.com/show_bug.cgi?id=627785

diff --git a/src/manager.c b/src/manager.c
index bc589ba..517473b 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -989,7 +989,7 @@ static int transaction_verify_order_one(Manager *m, Job *j, Job *from, unsigned
 
                 log_error("Unable to break cycle");
 
-                dbus_set_error(e, BUS_ERROR_TRANSACTION_ORDER_IS_CYCLIC, "Transaction order is cyclic. See logs for details.");
+                dbus_set_error(e, BUS_ERROR_TRANSACTION_ORDER_IS_CYCLIC, "Transaction order is cyclic. See system logs for details.");
                 return -ENOEXEC;
         }
 
@@ -1403,7 +1403,7 @@ static int transaction_add_job_and_dependencies(
         }
 
         if (type != JOB_STOP && unit->meta.load_state == UNIT_ERROR) {
-                dbus_set_error(e, BUS_ERROR_LOAD_FAILED, "Unit %s failed to load: %s. You might find more information in the logs.",
+                dbus_set_error(e, BUS_ERROR_LOAD_FAILED, "Unit %s failed to load: %s. You might find more information in the system logs.",
                                unit->meta.id,
                                strerror(-unit->meta.load_error));
                 return -EINVAL;
diff --git a/src/systemctl.c b/src/systemctl.c
index a85257f..41aea09 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -1081,7 +1081,7 @@ static int wait_for_jobs(DBusConnection *bus, Set *s) {
                 ;
 
         if (!arg_quiet && d.failed)
-                log_error("Job failed, see logs for details.");
+                log_error("Job failed, see system logs for details.");
 
         r = d.failed ? -EIO : 0;
 
commit eed1d0e33d0a46fb562820518031e3f861f9dcdc
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Sep 1 00:10:41 2010 +0200

    util: leave locked terminal attributes untouched so that we don't interfere with plymouth
    
    https://bugzilla.redhat.com/show_bug.cgi?id=628913

diff --git a/src/util.c b/src/util.c
index f982586..0cd1fd3 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1917,9 +1917,9 @@ int reset_terminal(int fd) {
 
         assert(fd >= 0);
 
-        /* First, unlock termios */
-        zero(termios);
-        ioctl(fd, TIOCSLCKTRMIOS, &termios);
+        /* We leave locked terminal attributes untouched, so that
+         * Plymouth may set whatever it wants to set, and we don't
+         * interfere with that. */
 
         /* Disable exclusive mode, just in case */
         ioctl(fd, TIOCNXCL);