[systemd-commits] 4 commits - man/systemctl.xml src/journal src/libsystemd-network src/network

[Lennart Poettering]

 man/systemctl.xml                      |    6 ++----
 src/journal/coredump.c                 |    7 +++++++
 src/libsystemd-network/sd-dhcp-lease.c |    2 +-
 src/network/networkctl.c               |    5 ++++-
 4 files changed, 14 insertions(+), 6 deletions(-)

New commits:
commit 2301cb9fdb774d0a1b3d8f5e95c5d358721ccacb
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Aug 15 03:06:11 2014 +0200

    networkctl: print local domain name in status output

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 8e02188..25097bb 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -288,7 +288,7 @@ static void dump_list(const char *prefix, char **l) {
 }
 
 static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
-        _cleanup_strv_free_ char **dns = NULL, **ntp = NULL;
+        _cleanup_strv_free_ char **dns = NULL, **ntp = NULL, **domains = NULL;
         _cleanup_free_ char *setup_state = NULL, *operational_state = NULL;
         _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL;
         _cleanup_udev_device_unref_ struct udev_device *d = NULL;
@@ -364,6 +364,7 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
 
         sd_network_link_get_dns(ifindex, &dns);
         sd_network_link_get_ntp(ifindex, &ntp);
+        sd_network_link_get_domains(ifindex, &domains);
 
         sprintf(devid, "n%i", ifindex);
         d = udev_device_new_from_device_id(udev, devid);
@@ -411,6 +412,8 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
 
         if (!strv_isempty(dns))
                 dump_list("         DNS: ", dns);
+        if (!strv_isempty(domains))
+                dump_list("     Domains: ", domains);
         if (!strv_isempty(ntp))
                 dump_list("         NTP: ", ntp);
 

commit 708281b81177f3a32d11770126727737a6a69483
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Aug 15 03:05:44 2014 +0200

    dhcp: the localhost isn't valid as hostname either

diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c
index e8cfd72..6680d06 100644
--- a/src/libsystemd-network/sd-dhcp-lease.c
+++ b/src/libsystemd-network/sd-dhcp-lease.c
@@ -537,7 +537,7 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const uint8_t *option,
                 if (r < 0)
                         return r;
 
-                if (!hostname_is_valid(hostname))
+                if (!hostname_is_valid(hostname) || is_localhost(hostname))
                         break;
 
                 free(lease->hostname);

commit 4d229b318af339c7a4711f3812335cb3ae6fb5aa
Author: Umut Tezduyar Lindskog <umut.tezduyar at axis.com>
Date:   Tue Jul 8 16:16:14 2014 +0200

    coredump: display libdw fail string on stack trace fail
    
    - systemd[1]: hello.service: main process exited, code= dumped, status=3/QUIT
    - systemd-coredump[2541]: Failed to generate stack trace: Unwinding not supported for this architecture
    - systemd-coredump[2541]: Process 1024 (hello) of user 154 dumped core.

diff --git a/src/journal/coredump.c b/src/journal/coredump.c
index db51098..79f51d1 100644
--- a/src/journal/coredump.c
+++ b/src/journal/coredump.c
@@ -26,6 +26,11 @@
 #include <sys/types.h>
 #include <sys/xattr.h>
 
+#ifdef HAVE_ELFUTILS
+#  include <dwarf.h>
+#  include <elfutils/libdwfl.h>
+#endif
+
 #include "systemd/sd-journal.h"
 #include "systemd/sd-login.h"
 
@@ -686,6 +691,8 @@ int main(int argc, char* argv[]) {
                 r = coredump_make_stack_trace(coredump_fd, exe, &stacktrace);
                 if (r >= 0)
                         core_message = strjoin("MESSAGE=Process ", info[INFO_PID], " (", comm, ") of user ", info[INFO_UID], " dumped core.\n\n", stacktrace, NULL);
+                else if (r == -EINVAL)
+                        log_warning("Failed to generate stack trace: %s", dwfl_errmsg(dwfl_errno()));
                 else
                         log_warning("Failed to generate stack trace: %s", strerror(-r));
         }

commit d0a3fb7556d77c44c2bc38a560e99d4ad0abcf33
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Aug 15 02:41:14 2014 +0200

    man: drop references to removed and obsolete 'systemctl load' command

diff --git a/man/systemctl.xml b/man/systemctl.xml
index a8d15b5..db7798d 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -637,8 +637,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
             file.</para>
 
             <para>This command should not be confused with the
-            <command>daemon-reload</command> or <command>load</command>
-            commands.</para>
+            <command>daemon-reload</command> command.</para>
           </listitem>
 
         </varlistentry>
@@ -1276,8 +1275,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
             tree. While the daemon is being reloaded, all sockets systemd
             listens on behalf of user configuration will stay
             accessible.</para> <para>This command should not be confused
-            with the <command>load</command> or
-            <command>reload</command> commands.</para>
+            with the <command>reload</command> command.</para>
           </listitem>
         </varlistentry>
         <varlistentry>