1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2 From: Gabriel Ebner <gebner@gebner.org>
3 Date: Sun, 6 Dec 2015 14:26:36 +0100
4 Subject: [PATCH] hostnamed, localed, timedated: disable methods that change
8 src/hostname/hostnamed.c | 6 ++++++
9 src/locale/localed.c | 9 +++++++++
10 src/timedate/timedated.c | 10 ++++++++++
11 3 files changed, 25 insertions(+)
13 diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
14 index 82d08803fa..8e40b77eba 100644
15 --- a/src/hostname/hostnamed.c
16 +++ b/src/hostname/hostnamed.c
17 @@ -1116,6 +1116,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_
21 + return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
22 + "Changing system settings via systemd is not supported on NixOS.");
24 name = empty_to_null(name);
26 context_read_etc_hostname(c);
27 @@ -1178,6 +1181,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess
31 + return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
32 + "Changing system settings via systemd is not supported on NixOS.");
34 name = empty_to_null(name);
36 context_read_machine_info(c);
37 diff --git a/src/locale/localed.c b/src/locale/localed.c
38 index c0d104578d..51a714ee23 100644
39 --- a/src/locale/localed.c
40 +++ b/src/locale/localed.c
41 @@ -226,6 +226,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er
43 use_localegen = locale_gen_check_available();
45 + return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
46 + "Changing system settings via systemd is not supported on NixOS.");
48 /* If single locale without variable name is provided, then we assume it is LANG=. */
49 if (strv_length(l) == 1 && !strchr(l[0], '=')) {
50 if (!locale_is_valid(l[0]))
51 @@ -343,6 +346,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro
53 return bus_log_parse_error(r);
55 + return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
56 + "Changing system settings via systemd is not supported on NixOS.");
58 vc_context_empty_to_null(&in);
60 r = vc_context_verify_and_warn(&in, LOG_ERR, error);
61 @@ -460,6 +466,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err
63 return bus_log_parse_error(r);
65 + return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
66 + "Changing system settings via systemd is not supported on NixOS.");
68 x11_context_empty_to_null(&in);
70 r = x11_context_verify_and_warn(&in, LOG_ERR, error);
71 diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
72 index e3b4367ec0..448aa7e94d 100644
73 --- a/src/timedate/timedated.c
74 +++ b/src/timedate/timedated.c
75 @@ -673,6 +673,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *
79 + if (getenv("NIXOS_STATIC_TIMEZONE"))
80 + return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
81 + "Changing timezone via systemd is not supported when it is set in NixOS configuration.");
83 if (!timezone_is_valid(z, LOG_DEBUG))
84 return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid or not installed time zone '%s'", z);
86 @@ -750,6 +754,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error
90 + return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
91 + "Changing system settings via systemd is not supported on NixOS.");
93 if (lrtc == c->local_rtc && !fix_system)
94 return sd_bus_reply_method_return(m, NULL);
96 @@ -928,6 +935,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error
100 + return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
101 + "Changing system settings via systemd is not supported on NixOS.");
103 r = context_update_ntp_status(c, bus, m);