picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hostnamectl: add more really basic system info to the status output

This commit is contained in:
Lennart Poettering 2012-10-21 03:35:33 +02:00
parent 7cd28a8a2f
commit fe29f9d25b
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/hostname/hostnamectl.c
View File

@ -25,6 +25,7 @@
#include <getopt.h>
#include <string.h>
#include <sys/timex.h>
#include <sys/utsname.h>
#include "dbus-common.h"
#include "util.h"
@ -66,7 +67,9 @@ typedef struct StatusInfo {
static void print_status_info(StatusInfo *i) {
sd_id128_t mid, bid;
int r;
const char *id;
const char *id = NULL;
_cleanup_free_ char *pretty_name = NULL, *cpe_name = NULL;
struct utsname u;
assert(i);
@ -90,8 +93,24 @@ static void print_status_info(StatusInfo *i) {
if (r >= 0)
printf(" Boot ID: " SD_ID128_FORMAT_STR "\n", SD_ID128_FORMAT_VAL(bid));
if (detect_virtualization(&id) >= 0)
if (detect_virtualization(&id) > 0)
printf(" Virtualization: %s\n", id);
r = parse_env_file("/etc/os-release", NEWLINE,
"PRETTY_NAME", &pretty_name,
"CPE_NAME", &cpe_name,
NULL);
if (!isempty(pretty_name))
printf(" Operating System: %s\n", pretty_name);
if (!isempty(cpe_name))
printf(" CPE OS Name: %s\n", cpe_name);
assert_se(uname(&u) >= 0);
printf(" Kernel: %s %s\n"
" Architecture: %s\n", u.sysname, u.release, u.machine);
}
static int status_property(const char *name, DBusMessageIter *iter, StatusInfo *i) {