[systemd-commits] 2 commits - src/boot src/hostname

[Thomas H.P. Andersen]

 src/boot/bootctl.c       |    2 +-
 src/hostname/hostnamed.c |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 95b015de3849d8d8d03d9441ae1682a04c38833b
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date:   Wed Nov 6 00:30:29 2013 +0100

    hostnamed: prevent it from crashing if the chassis is unknown
    
    When fallback_chassis would return null it led to a crash and an
    empty result in hostnamectl. Only seen after the sd-port.

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index 0854bc4..ece5d1d 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -360,6 +360,9 @@ static int property_get_chassis(
         else
                 name = c->data[PROP_CHASSIS];
 
+        if(!name)
+                name = "";
+
         r = sd_bus_message_append(reply, "s", name);
         if (r < 0)
                 return r;

commit 82de16f92ca5259e9ddb4f328f086cb6a9f043b0
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date:   Wed Nov 6 00:29:49 2013 +0100

    bootctl: typo fix in help message

diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index af694fd..d25ddef 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -34,7 +34,7 @@
 
 static int help(void) {
         printf("%s [OPTIONS...] COMMAND ...\n\n"
-               "Query or change firmware and boot mananger settings.\n\n"
+               "Query or change firmware and boot manager settings.\n\n"
                "  -h --help              Show this help\n"
                "     --version           Show package version\n"
                "Commands:\n"