109 lines
4.2 KiB
Diff
109 lines
4.2 KiB
Diff
From 6c12e0d2afe80563e692fc1f2f545a487c83418c Mon Sep 17 00:00:00 2001
|
|
From: Gabriel Ebner <gebner@gebner.org>
|
|
Date: Sun, 6 Dec 2015 14:26:36 +0100
|
|
Subject: [PATCH 07/18] hostnamed, localed, timedated: disable methods that
|
|
change system settings.
|
|
|
|
---
|
|
src/hostname/hostnamed.c | 6 ++++++
|
|
src/locale/localed.c | 9 +++++++++
|
|
src/timedate/timedated.c | 10 ++++++++++
|
|
3 files changed, 25 insertions(+)
|
|
|
|
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
|
|
index 7f6607a527..b5a9388916 100644
|
|
--- a/src/hostname/hostnamed.c
|
|
+++ b/src/hostname/hostnamed.c
|
|
@@ -626,6 +626,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_
|
|
if (r < 0)
|
|
return r;
|
|
|
|
+ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
|
|
+ "Changing system settings via systemd is not supported on NixOS.");
|
|
+
|
|
name = empty_to_null(name);
|
|
|
|
context_read_etc_hostname(c);
|
|
@@ -685,6 +688,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess
|
|
if (r < 0)
|
|
return r;
|
|
|
|
+ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
|
|
+ "Changing system settings via systemd is not supported on NixOS.");
|
|
+
|
|
name = empty_to_null(name);
|
|
|
|
context_read_machine_info(c);
|
|
diff --git a/src/locale/localed.c b/src/locale/localed.c
|
|
index 715ce5cac7..014f7dcf6c 100644
|
|
--- a/src/locale/localed.c
|
|
+++ b/src/locale/localed.c
|
|
@@ -317,6 +317,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er
|
|
if (r < 0)
|
|
return r;
|
|
|
|
+ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
|
|
+ "Changing system settings via systemd is not supported on NixOS.");
|
|
+
|
|
/* If single locale without variable name is provided, then we assume it is LANG=. */
|
|
if (strv_length(l) == 1 && !strchr(l[0], '=')) {
|
|
if (!locale_is_valid(l[0]))
|
|
@@ -432,6 +435,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro
|
|
if (r < 0)
|
|
return r;
|
|
|
|
+ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
|
|
+ "Changing system settings via systemd is not supported on NixOS.");
|
|
+
|
|
keymap = empty_to_null(keymap);
|
|
keymap_toggle = empty_to_null(keymap_toggle);
|
|
|
|
@@ -606,6 +612,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err
|
|
if (r < 0)
|
|
return r;
|
|
|
|
+ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
|
|
+ "Changing system settings via systemd is not supported on NixOS.");
|
|
+
|
|
layout = empty_to_null(layout);
|
|
model = empty_to_null(model);
|
|
variant = empty_to_null(variant);
|
|
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
|
|
index c467b85477..3e78b2f575 100644
|
|
--- a/src/timedate/timedated.c
|
|
+++ b/src/timedate/timedated.c
|
|
@@ -646,6 +646,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *
|
|
if (r < 0)
|
|
return r;
|
|
|
|
+ if (getenv("NIXOS_STATIC_TIMEZONE"))
|
|
+ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
|
|
+ "Changing timezone via systemd is not supported when it is set in NixOS configuration.");
|
|
+
|
|
if (!timezone_is_valid(z, LOG_DEBUG))
|
|
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid or not installed time zone '%s'", z);
|
|
|
|
@@ -725,6 +729,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error
|
|
if (r < 0)
|
|
return r;
|
|
|
|
+ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
|
|
+ "Changing system settings via systemd is not supported on NixOS.");
|
|
+
|
|
if (lrtc == c->local_rtc)
|
|
return sd_bus_reply_method_return(m, NULL);
|
|
|
|
@@ -917,6 +924,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error
|
|
if (r < 0)
|
|
return r;
|
|
|
|
+ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
|
|
+ "Changing system settings via systemd is not supported on NixOS.");
|
|
+
|
|
r = context_update_ntp_status(c, bus, m);
|
|
if (r < 0)
|
|
return r;
|
|
--
|
|
2.27.0
|
|
|