X Tutup
Skip to content

Commit 799298d

Browse files
johannbgkeszybz
johannbg
authored and
keszybz
committed
Add DEPLOYMENT to hostnamectl
[zj: remove the check against a fixed list of environments.]
1 parent 1ed7749 commit 799298d

File tree

4 files changed

+96
-8
lines changed

4 files changed

+96
-8
lines changed

‎man/hostnamectl.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,27 @@
231231
</listitem>
232232
</varlistentry>
233233

234+
<varlistentry>
235+
<term><command>set-deployment <replaceable>ENVIRONMENT</replaceable></command></term>
236+
237+
<listitem><para>Set the deployment
238+
environment description.
239+
<replaceable>ENVIRONMENT</replaceable>
240+
must be a single word without any
241+
control characters. One of the
242+
following is suggested:
243+
<literal>development</literal>,
244+
<literal>integration</literal>,
245+
<literal>staging</literal>,
246+
<literal>production</literal>.
247+
</para>
248+
249+
<para>Pass an empty string to reset to
250+
the default empty value.</para>
251+
</listitem>
252+
</varlistentry>
253+
254+
234255
</variablelist>
235256
</refsect1>
236257

‎man/machine-info.xml‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,20 @@
157157
available.</para></listitem>
158158
</varlistentry>
159159

160+
<varlistentry>
161+
<term><varname>DEPLOYMENT=</varname></term>
162+
163+
<listitem><para>Describes the system
164+
deployment environment. One of the
165+
following is suggested:
166+
<literal>development</literal>,
167+
<literal>integration</literal>,
168+
<literal>staging</literal>,
169+
<literal>production</literal>.
170+
</para></listitem>
171+
</varlistentry>
172+
173+
160174
</variablelist>
161175

162176
</refsect1>
@@ -166,7 +180,8 @@
166180

167181
<programlisting>PRETTY_HOSTNAME="Lennart's Tablet"
168182
ICON_NAME=computer-tablet
169-
CHASSIS=tablet</programlisting>
183+
CHASSIS=tablet
184+
DEPLOYMENT=production</programlisting>
170185
</refsect1>
171186

172187
<refsect1>

‎src/hostname/hostnamectl.c‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ typedef struct StatusInfo {
6767
char *pretty_hostname;
6868
char *icon_name;
6969
char *chassis;
70+
char *deployment;
7071
char *kernel_name;
7172
char *kernel_release;
7273
char *os_pretty_name;
@@ -92,9 +93,11 @@ static void print_status_info(StatusInfo *i) {
9293
printf("Transient hostname: %s\n", i->hostname);
9394

9495
printf(" Icon name: %s\n"
95-
" Chassis: %s\n",
96+
" Chassis: %s\n"
97+
" Deployment: %s\n",
9698
strna(i->icon_name),
97-
strna(i->chassis));
99+
strna(i->chassis),
100+
strna(i->deployment));
98101

99102
r = sd_id128_get_machine(&mid);
100103
if (r >= 0)
@@ -157,6 +160,7 @@ static int show_all_names(sd_bus *bus) {
157160
{ "PrettyHostname", "s", NULL, offsetof(StatusInfo, pretty_hostname) },
158161
{ "IconName", "s", NULL, offsetof(StatusInfo, icon_name) },
159162
{ "Chassis", "s", NULL, offsetof(StatusInfo, chassis) },
163+
{ "Deployment", "s", NULL, offsetof(StatusInfo, deployment) },
160164
{ "KernelName", "s", NULL, offsetof(StatusInfo, kernel_name) },
161165
{ "KernelRelease", "s", NULL, offsetof(StatusInfo, kernel_release) },
162166
{ "OperatingSystemPrettyName", "s", NULL, offsetof(StatusInfo, os_pretty_name) },
@@ -194,6 +198,7 @@ static int show_all_names(sd_bus *bus) {
194198
free(info.pretty_hostname);
195199
free(info.icon_name);
196200
free(info.chassis);
201+
free(info.deployment);
197202
free(info.kernel_name);
198203
free(info.kernel_release);
199204
free(info.os_pretty_name);
@@ -309,6 +314,13 @@ static int set_chassis(sd_bus *bus, char **args, unsigned n) {
309314
return set_simple_string(bus, "SetChassis", args[1]);
310315
}
311316

317+
static int set_deployment(sd_bus *bus, char **args, unsigned n) {
318+
assert(args);
319+
assert(n == 2);
320+
321+
return set_simple_string(bus, "SetDeployment", args[1]);
322+
}
323+
312324
static int help(void) {
313325

314326
printf("%s [OPTIONS...] COMMAND ...\n\n"
@@ -325,7 +337,8 @@ static int help(void) {
325337
" status Show current hostname settings\n"
326338
" set-hostname NAME Set system hostname\n"
327339
" set-icon-name NAME Set icon name for host\n"
328-
" set-chassis NAME Set chassis type for host\n",
340+
" set-chassis NAME Set chassis type for host\n"
341+
" set-deployment NAME Set deployment environment for host\n",
329342
program_invocation_short_name);
330343

331344
return 0;
@@ -423,6 +436,7 @@ static int hostnamectl_main(sd_bus *bus, int argc, char *argv[]) {
423436
{ "set-hostname", EQUAL, 2, set_hostname },
424437
{ "set-icon-name", EQUAL, 2, set_icon_name },
425438
{ "set-chassis", EQUAL, 2, set_chassis },
439+
{ "set-deployment", EQUAL, 2, set_deployment },
426440
};
427441

428442
int left;

‎src/hostname/hostnamed.c‎

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,15 @@
3535
#include "bus-util.h"
3636
#include "event-util.h"
3737

38+
#define VALID_DEPLOYMENT_CHARS (DIGITS LETTERS "-.:")
39+
3840
enum {
3941
PROP_HOSTNAME,
4042
PROP_STATIC_HOSTNAME,
4143
PROP_PRETTY_HOSTNAME,
4244
PROP_ICON_NAME,
4345
PROP_CHASSIS,
46+
PROP_DEPLOYMENT,
4447
PROP_KERNEL_NAME,
4548
PROP_KERNEL_RELEASE,
4649
PROP_KERNEL_VERSION,
@@ -100,6 +103,7 @@ static int context_read_data(Context *c) {
100103
"PRETTY_HOSTNAME", &c->data[PROP_PRETTY_HOSTNAME],
101104
"ICON_NAME", &c->data[PROP_ICON_NAME],
102105
"CHASSIS", &c->data[PROP_CHASSIS],
106+
"DEPLOYMENT", &c->data[PROP_DEPLOYMENT],
103107
NULL);
104108
if (r < 0 && r != -ENOENT)
105109
return r;
@@ -134,7 +138,6 @@ static bool check_nss(void) {
134138
}
135139

136140
static bool valid_chassis(const char *chassis) {
137-
138141
assert(chassis);
139142

140143
return nulstr_contains(
@@ -149,6 +152,12 @@ static bool valid_chassis(const char *chassis) {
149152
chassis);
150153
}
151154

155+
static bool valid_deployment(const char *deployment) {
156+
assert(deployment);
157+
158+
return strspn(deployment, VALID_DEPLOYMENT_CHARS) == strlen(deployment);
159+
}
160+
152161
static const char* fallback_chassis(void) {
153162
int r;
154163
char *type;
@@ -258,6 +267,7 @@ static char* context_fallback_icon_name(Context *c) {
258267
return strdup("computer");
259268
}
260269

270+
261271
static bool hostname_is_useful(const char *hn) {
262272
return !isempty(hn) && !is_localhost(hn);
263273
}
@@ -312,7 +322,8 @@ static int context_write_data_machine_info(Context *c) {
312322
static const char * const name[_PROP_MAX] = {
313323
[PROP_PRETTY_HOSTNAME] = "PRETTY_HOSTNAME",
314324
[PROP_ICON_NAME] = "ICON_NAME",
315-
[PROP_CHASSIS] = "CHASSIS"
325+
[PROP_CHASSIS] = "CHASSIS",
326+
[PROP_DEPLOYMENT] = "DEPLOYMENT",
316327
};
317328

318329
_cleanup_strv_free_ char **l = NULL;
@@ -324,7 +335,7 @@ static int context_write_data_machine_info(Context *c) {
324335
if (r < 0 && r != -ENOENT)
325336
return r;
326337

327-
for (p = PROP_PRETTY_HOSTNAME; p <= PROP_CHASSIS; p++) {
338+
for (p = PROP_PRETTY_HOSTNAME; p <= PROP_DEPLOYMENT; p++) {
328339
char *t, **u;
329340

330341
assert(name[p]);
@@ -402,6 +413,23 @@ static int property_get_chassis(
402413
return sd_bus_message_append(reply, "s", name);
403414
}
404415

416+
static int property_get_deployment(
417+
sd_bus *bus,
418+
const char *path,
419+
const char *interface,
420+
const char *property,
421+
sd_bus_message *reply,
422+
void *userdata,
423+
sd_bus_error *error) {
424+
425+
Context *c = userdata;
426+
const char *name;
427+
428+
name = c->data[PROP_DEPLOYMENT];
429+
430+
return sd_bus_message_append(reply, "s", name);
431+
}
432+
405433
static int method_set_hostname(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *error) {
406434
Context *c = userdata;
407435
const char *name;
@@ -555,6 +583,8 @@ static int set_machine_info(Context *c, sd_bus *bus, sd_bus_message *m, int prop
555583
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid pretty host name '%s'", name);
556584
if (prop == PROP_CHASSIS && !valid_chassis(name))
557585
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid chassis '%s'", name);
586+
if (prop == PROP_DEPLOYMENT && !valid_deployment(name))
587+
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid deployment '%s'", name);
558588

559589
h = strdup(name);
560590
if (!h)
@@ -572,11 +602,13 @@ static int set_machine_info(Context *c, sd_bus *bus, sd_bus_message *m, int prop
572602

573603
log_info("Changed %s to '%s'",
574604
prop == PROP_PRETTY_HOSTNAME ? "pretty host name" :
605+
prop == PROP_DEPLOYMENT ? "deployment" :
575606
prop == PROP_CHASSIS ? "chassis" : "icon name", strna(c->data[prop]));
576607

577608
sd_bus_emit_properties_changed(bus, "/org/freedesktop/hostname1", "org.freedesktop.hostname1",
578609
prop == PROP_PRETTY_HOSTNAME ? "PrettyHostname" :
579-
prop == PROP_CHASSIS ? "Chassis" : "IconName", NULL);
610+
prop == PROP_DEPLOYMENT ? "Deployment" :
611+
prop == PROP_CHASSIS ? "Chassis" : "IconName" , NULL);
580612

581613
return sd_bus_reply_method_return(m, NULL);
582614
}
@@ -593,13 +625,18 @@ static int method_set_chassis(sd_bus *bus, sd_bus_message *m, void *userdata, sd
593625
return set_machine_info(userdata, bus, m, PROP_CHASSIS, method_set_chassis, error);
594626
}
595627

628+
static int method_set_deployment(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *error) {
629+
return set_machine_info(userdata, bus, m, PROP_DEPLOYMENT, method_set_deployment, error);
630+
}
631+
596632
static const sd_bus_vtable hostname_vtable[] = {
597633
SD_BUS_VTABLE_START(0),
598634
SD_BUS_PROPERTY("Hostname", "s", NULL, offsetof(Context, data) + sizeof(char*) * PROP_HOSTNAME, 0),
599635
SD_BUS_PROPERTY("StaticHostname", "s", NULL, offsetof(Context, data) + sizeof(char*) * PROP_STATIC_HOSTNAME, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
600636
SD_BUS_PROPERTY("PrettyHostname", "s", NULL, offsetof(Context, data) + sizeof(char*) * PROP_PRETTY_HOSTNAME, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
601637
SD_BUS_PROPERTY("IconName", "s", property_get_icon_name, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
602638
SD_BUS_PROPERTY("Chassis", "s", property_get_chassis, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
639+
SD_BUS_PROPERTY("Deployment", "s", property_get_deployment, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
603640
SD_BUS_PROPERTY("KernelName", "s", NULL, offsetof(Context, data) + sizeof(char*) * PROP_KERNEL_NAME, SD_BUS_VTABLE_PROPERTY_CONST),
604641
SD_BUS_PROPERTY("KernelRelease", "s", NULL, offsetof(Context, data) + sizeof(char*) * PROP_KERNEL_RELEASE, SD_BUS_VTABLE_PROPERTY_CONST),
605642
SD_BUS_PROPERTY("KernelVersion", "s", NULL, offsetof(Context, data) + sizeof(char*) * PROP_KERNEL_VERSION, SD_BUS_VTABLE_PROPERTY_CONST),
@@ -610,6 +647,7 @@ static const sd_bus_vtable hostname_vtable[] = {
610647
SD_BUS_METHOD("SetPrettyHostname", "sb", NULL, method_set_pretty_hostname, SD_BUS_VTABLE_UNPRIVILEGED),
611648
SD_BUS_METHOD("SetIconName", "sb", NULL, method_set_icon_name, SD_BUS_VTABLE_UNPRIVILEGED),
612649
SD_BUS_METHOD("SetChassis", "sb", NULL, method_set_chassis, SD_BUS_VTABLE_UNPRIVILEGED),
650+
SD_BUS_METHOD("SetDeployment", "sb", NULL, method_set_deployment, SD_BUS_VTABLE_UNPRIVILEGED),
613651
SD_BUS_VTABLE_END,
614652
};
615653

0 commit comments

Comments
 (0)
X Tutup