From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 21 Feb 2014 01:28:54 +0000 (+0100)
Subject: hostnamectl: should the sanitized arch, not the native uname() one
X-Git-Tag: v210~102
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=d9d93745cd2efcdfca8f82d798e61e0ee70cef5c;ds=sidebyside

hostnamectl: should the sanitized arch, not the native uname() one
---

diff --git a/src/core/main.c b/src/core/main.c
index 7566b0a74..086e283dc 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -51,6 +51,7 @@
 #include "strv.h"
 #include "def.h"
 #include "virt.h"
+#include "architecture.h"
 #include "watchdog.h"
 #include "path-util.h"
 #include "switch-root.h"
@@ -1510,6 +1511,8 @@ int main(int argc, char *argv[]) {
                 if (virtualization)
                         log_info("Detected virtualization '%s'.", virtualization);
 
+                log_info("Detected architecture '%s'.", architecture_to_string(uname_architecture()));
+
                 if (in_initrd())
                         log_info("Running in initial RAM disk.");
 
diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c
index afbf37db5..e455249e9 100644
--- a/src/hostname/hostnamectl.c
+++ b/src/hostname/hostnamectl.c
@@ -39,6 +39,7 @@
 #include "strv.h"
 #include "sd-id128.h"
 #include "virt.h"
+#include "architecture.h"
 #include "fileio.h"
 
 static bool arg_ask_password = true;
@@ -121,7 +122,9 @@ static void print_status_info(StatusInfo *i) {
 
         assert_se(uname(&u) >= 0);
         printf("            Kernel: %s %s\n"
-               "      Architecture: %s\n", u.sysname, u.release, u.machine);
+               "      Architecture: %s\n",
+               u.sysname, u.release,
+               architecture_to_string(uname_architecture()));
 
 }