[systemd-commits] 2 commits - src/journal src/systemctl.c

[Lennart Poettering]

 src/journal/sd-journal.c |    2 +-
 src/systemctl.c          |   22 +++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

New commits:
commit ce3fd7e72a1b101002617bd410031e65d290f56f
Author: Dan Horák <dan at danny.cz>
Date:   Thu Jan 19 12:42:53 2012 +0100

    journal: systemd v38 fails to build on big-endians
    
    Hi,
    
    during the builds for Fedora/s390x I've found that systemd v38 fails to
    build on big-endian platforms.
    
    ...
    make[2]: Entering directory `/root/systemd'
      CC     src/journal/libsystemd_journal_la-sd-journal.lo
    src/journal/sd-journal.c: In function 'init_location':
    src/journal/sd-journal.c:69:22: error: incompatible types when
    initializing type 'long unsigned int' using type 'sd_id128_t'
    src/journal/sd-journal.c:69:20: error: incompatible types when assigning
    to type 'sd_id128_t' from type 'long unsigned int'
    make[2]: *** [src/journal/libsystemd_journal_la-sd-journal.lo] Error 1
    
    I see the problem in using le64toh() on the 16 bytes boot_id structure
    in init_location()
    
    Please see
    http://s390.koji.fedoraproject.org/koji/taskinfo?taskID=544375 for a
    full build log and attachment for a proposed fix.
    
    With regards
    
    Dan

diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index 5e1fd47..baf51db 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -66,7 +66,7 @@ static void init_location(Location *l, JournalFile *f, Object *o) {
         l->seqnum_id = f->header->seqnum_id;
         l->realtime = le64toh(o->entry.realtime);
         l->monotonic = le64toh(o->entry.monotonic);
-        l->boot_id = le64toh(o->entry.boot_id);
+        l->boot_id = o->entry.boot_id;
         l->xor_hash = le64toh(o->entry.xor_hash);
 
         l->seqnum_set = l->realtime_set = l->monotonic_set = l->xor_hash_set = true;

commit d1f262fa46a1ae9450d3a9aa1f103a16120de350
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sat Jan 21 03:44:11 2012 +0100

    systemctl: don't show ln -s/rm output in 'install' mode if --quiet is passed

diff --git a/src/systemctl.c b/src/systemctl.c
index d7d7d67..cb59fd6 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -3688,11 +3688,13 @@ static int enable_unit(DBusConnection *bus, char **args) {
                         goto finish;
                 }
 
-                for (i = 0; i < n_changes; i++) {
-                        if (changes[i].type == UNIT_FILE_SYMLINK)
-                                log_info("ln -s '%s' '%s'", changes[i].source, changes[i].path);
-                        else
-                                log_info("rm '%s'", changes[i].path);
+                if (!arg_quiet) {
+                        for (i = 0; i < n_changes; i++) {
+                                if (changes[i].type == UNIT_FILE_SYMLINK)
+                                        log_info("ln -s '%s' '%s'", changes[i].source, changes[i].path);
+                                else
+                                        log_info("rm '%s'", changes[i].path);
+                        }
                 }
 
         } else {
@@ -3808,10 +3810,12 @@ static int enable_unit(DBusConnection *bus, char **args) {
                                 goto finish;
                         }
 
-                        if (streq(type, "symlink"))
-                                log_info("ln -s '%s' '%s'", source, path);
-                        else
-                                log_info("rm '%s'", path);
+                        if (!arg_quiet) {
+                                if (streq(type, "symlink"))
+                                        log_info("ln -s '%s' '%s'", source, path);
+                                else
+                                        log_info("rm '%s'", path);
+                        }
 
                         dbus_message_iter_next(&sub);
                 }