73 lines
3.1 KiB
Diff
73 lines
3.1 KiB
Diff
From 2203c07490c8b64286cf2d04dbb110f4173912a1 Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Thu, 6 Nov 2014 14:37:12 +0100
|
|
Subject: [PATCH] hostnamed: introduce new "embedded" chassis type
|
|
|
|
We really don't want to get lost in adding fridge, car, plane, drone, or
|
|
whatever else, hence add a generic term "embedded" cover all the cases
|
|
where the computer is just part of something bigger, and not at the
|
|
focus of things.
|
|
|
|
(cherry picked from commit 25fa306ed58b0b7fe30ca9be37c66a7b3b2de70e)
|
|
---
|
|
man/hostnamectl.xml | 3 ++-
|
|
shell-completion/bash/hostnamectl | 2 +-
|
|
shell-completion/zsh/_hostnamectl | 2 +-
|
|
src/hostname/hostnamed.c | 3 ++-
|
|
4 files changed, 6 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml
|
|
index 128d92f576..ffae5e6b06 100644
|
|
--- a/man/hostnamectl.xml
|
|
+++ b/man/hostnamectl.xml
|
|
@@ -217,7 +217,8 @@
|
|
<literal>server</literal>,
|
|
<literal>tablet</literal>,
|
|
<literal>handset</literal>,
|
|
- <literal>watch</literal>, as well as
|
|
+ <literal>watch</literal>,
|
|
+ <literal>embedded</literal> as well as
|
|
the special chassis types
|
|
<literal>vm</literal> and
|
|
<literal>container</literal> for
|
|
diff --git a/shell-completion/bash/hostnamectl b/shell-completion/bash/hostnamectl
|
|
index a5e34600c8..7a0850dbe4 100644
|
|
--- a/shell-completion/bash/hostnamectl
|
|
+++ b/shell-completion/bash/hostnamectl
|
|
@@ -52,7 +52,7 @@ _hostnamectl() {
|
|
if [[ -z $verb ]]; then
|
|
comps=${VERBS[*]}
|
|
elif __contains_word "$verb" ${VERBS[CHASSIS]}; then
|
|
- comps='desktop laptop server tablet handset watch vm container'
|
|
+ comps='desktop laptop server tablet handset watch embedded vm container'
|
|
elif __contains_word "$verb" ${VERBS[STANDALONE]} ${VERBS[ICONS]} ${VERBS[NAME]}; then
|
|
comps=''
|
|
fi
|
|
diff --git a/shell-completion/zsh/_hostnamectl b/shell-completion/zsh/_hostnamectl
|
|
index e02f6de30e..a7217a1999 100644
|
|
--- a/shell-completion/zsh/_hostnamectl
|
|
+++ b/shell-completion/zsh/_hostnamectl
|
|
@@ -18,7 +18,7 @@ _hostnamectl_set-icon-name() {
|
|
|
|
_hostnamectl_set-chassis() {
|
|
if (( CURRENT <= 3 )); then
|
|
- _chassis=( desktop laptop server tablet handset watch vm container )
|
|
+ _chassis=( desktop laptop server tablet handset watch embedded vm container )
|
|
_describe chassis _chassis
|
|
else
|
|
_message "no more options"
|
|
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
|
|
index a449610bb8..0123922c4a 100644
|
|
--- a/src/hostname/hostnamed.c
|
|
+++ b/src/hostname/hostnamed.c
|
|
@@ -138,7 +138,8 @@ static bool valid_chassis(const char *chassis) {
|
|
"server\0"
|
|
"tablet\0"
|
|
"handset\0"
|
|
- "watch\0",
|
|
+ "watch\0"
|
|
+ "embedded\0",
|
|
chassis);
|
|
}
|
|
|