From 5d34545954b260fe0d8dc744972dd42b4d0dcad2 Mon Sep 17 00:00:00 2001
From: Janne Heß <janne@hess.ooo>
Date: Sun, 5 Dec 2021 18:47:35 +0100
Subject: nixos/switch-to-configuration: Ignore scopes

---
 nixos/modules/system/activation/switch-to-configuration.pl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'nixos/modules/system/activation')

diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 8a3b6a225c0..6ba72638b45 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -500,7 +500,9 @@ while (my ($unit, $state) = each %{$activeNew}) {
             push @failed, $unit;
         }
     }
-    elsif ($state->{state} ne "failed" && !defined $activePrev->{$unit}) {
+    # Ignore scopes since they are not managed by this script but rather
+    # created and managed by third-party services via the systemd dbus API.
+    elsif ($state->{state} ne "failed" && !defined $activePrev->{$unit} && $unit !~ /\.scope$/) {
         push @new, $unit;
     }
 }
-- 
cgit 1.4.1