Sovran_Systems/Sovran_SystemsOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert: restore rdp.nix to pre-PR#147 working state with || true fix

Browse Source 
- Remove systemd.services."gnome-remote-desktop".wantedBy = lib.mkForce []
  (was preventing the service from ever auto-starting)
- Remove systemctl start gnome-remote-desktop.service || true
  (was creating a systemd deadlock with before = ["gnome-remote-desktop.service"])
- Remove pkgs.systemd from setup script path
- Remove grdctl --system rdp disable-view-only || true
- Add || true to grdctl --system rdp enable (suppress harmless EROFS warning)

Agent-Logs-Url: https://github.com/naturallaw777/staging_alpha/sessions/75c67389-947f-437d-95ba-427504935156

Co-authored-by: naturallaw777 <99053422+naturallaw777@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-04-08 21:29:48 +00:00
committed by GitHub
parent 73401353e4
commit 1bbf6094b3
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/rdp.nix
View File

@@ -13,11 +13,6 @@ lib.mkIf config.sovran_systemsOS.features.rdp {
# Enable the GNOME Remote Desktop service at the system level
services.gnome.gnome-remote-desktop.enable = true;
# Prevent the system-level service from auto-starting via GDM's target ordering.
# This avoids the "Session Already Running" GDM dialog when free is auto-logged-in.
# We start the service explicitly from the setup script after configuration is complete.
systemd.services."gnome-remote-desktop".wantedBy = lib.mkForce [];
# Open RDP port in the firewall
networking.firewall.allowedTCPPorts = [ 3389 ];
@@ -44,7 +39,6 @@ lib.mkIf config.sovran_systemsOS.features.rdp {
pkgs.openssl
pkgs.hostname
pkgs.gawk
pkgs.systemd
];
script = ''
# Ensure directory structure exists
@@ -117,14 +111,9 @@ lib.mkIf config.sovran_systemsOS.features.rdp {
chmod 600 "$CRED_FILE"
grdctl --system rdp enable
# Enable RDP backend and set credentials
grdctl --system rdp enable || true
grdctl --system rdp set-credentials sovran "$PASSWORD"
grdctl --system rdp disable-view-only || true
# Start the service now that everything is configured.
# The service won't auto-start (wantedBy is empty), so we start it explicitly
# after TLS certs and credentials are fully configured.
systemctl start gnome-remote-desktop.service || true
echo "GNOME Remote Desktop RDP configured successfully"
'';