diff options
| author | Ron Yorston <rmy@frippery.org> | 2015-07-12 16:06:37 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2015-08-03 18:09:18 +0200 |
| commit | 64ed5f0d3c5eefbb208d4a334654834c78be2cbd (patch) | |
| tree | 78b7a32dfb2162234c9c70b982317d9f2aa520df | |
| parent | b27cf31003774e5aa13491ccb8f1f0721dc5b920 (diff) | |
uname: make OS name configurable
A mailing list thread in September 2013 discussed changing the string
returned by the non-POSIX 'uname -o' option. Nothing ever came of this
because there was no agreement as to what the string should be.
Make the string configurable so that people can decide for themselves.
Signed-off-by: Ron Yorston <rmy@frippery.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | coreutils/Config.src | 8 | ||||
| -rw-r--r-- | coreutils/uname.c | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/coreutils/Config.src b/coreutils/Config.src index 02155d220..ffbef1a31 100644 --- a/coreutils/Config.src +++ b/coreutils/Config.src @@ -630,6 +630,14 @@ config UNAME help uname is used to print system information. +config UNAME_OSNAME + string "Operating system name" + default "GNU/Linux" + depends on UNAME + help + Sets the operating system name reported by uname -o. The + default is "GNU/Linux". + config UNEXPAND bool "unexpand" default y diff --git a/coreutils/uname.c b/coreutils/uname.c index 1c6aa5f79..fd677d27c 100644 --- a/coreutils/uname.c +++ b/coreutils/uname.c @@ -74,7 +74,7 @@ typedef struct { struct utsname name; char processor[sizeof(((struct utsname*)NULL)->machine)]; char platform[sizeof(((struct utsname*)NULL)->machine)]; - char os[sizeof("GNU/Linux")]; + char os[sizeof(CONFIG_UNAME_OSNAME)]; } uname_info_t; static const char options[] ALIGN1 = "snrvmpioa"; @@ -141,7 +141,7 @@ int uname_main(int argc UNUSED_PARAM, char **argv) #endif strcpy(uname_info.processor, unknown_str); strcpy(uname_info.platform, unknown_str); - strcpy(uname_info.os, "GNU/Linux"); + strcpy(uname_info.os, CONFIG_UNAME_OSNAME); #if 0 /* Fedora does something like this */ strcpy(uname_info.processor, uname_info.name.machine); |