mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-29 09:02:46 +00:00
483dbe9237
This permits using method_set_hostname but still denies method_set_static_hostname. As a result DHCP clients can now always set the transient hostname via the SetHostname method of the D-Bus interface of systemd-hostnamed (org.freedesktop.hostname1.set-hostname). If the NixOS option networking.hostName is set to an empty string (or "localhost") the static hostname (kernel.hostname but NOT /etc/hostname) will additionally be updated (this is intended). From "man hostnamectl": The transient hostname is a fallback value received from network configuration. If a static hostname is set, and is valid (something other than localhost), then the transient hostname is not used. Fix #74847. Note: It's possible to restrict access to the org.freedesktop.hostname1 interface using Polkit rules.
109 lines
4.3 KiB
Diff
109 lines
4.3 KiB
Diff
From e2b25ce3606d05ff8a387185c41ab32fb2a36161 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 | 9 +++++++++
|
|
src/locale/localed.c | 9 +++++++++
|
|
src/timedate/timedated.c | 10 ++++++++++
|
|
3 files changed, 28 insertions(+)
|
|
|
|
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
|
|
index 21f6471495..8c5af7619f 100644
|
|
--- a/src/hostname/hostnamed.c
|
|
+++ b/src/hostname/hostnamed.c
|
|
@@ -478,6 +481,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);
|
|
|
|
if (streq_ptr(name, c->data[PROP_STATIC_HOSTNAME]))
|
|
@@ -535,6 +541,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);
|
|
|
|
if (streq_ptr(name, c->data[prop]))
|
|
diff --git a/src/locale/localed.c b/src/locale/localed.c
|
|
index 09f16d25f4..c1cb87cef1 100644
|
|
--- a/src/locale/localed.c
|
|
+++ b/src/locale/localed.c
|
|
@@ -275,6 +275,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, '=')) {
|
|
if (!locale_is_valid(*l))
|
|
@@ -410,6 +413,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);
|
|
|
|
@@ -586,6 +592,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 5e2fb50d83..63865f557c 100644
|
|
--- a/src/timedate/timedated.c
|
|
+++ b/src/timedate/timedated.c
|
|
@@ -652,6 +652,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);
|
|
|
|
@@ -731,6 +735,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);
|
|
|
|
@@ -923,6 +930,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.26.2
|
|
|