Merge remote-tracking branch 'origin/bugfix/7689-fix-tails-restricted-network-detector' into stable

Fix-committed: #7689

config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector

@@ -61,9 +61,15 @@ while(my $sl = $parser->next) {
         # The beginning of *all* (not only wireless) new
         # connections. We drop any previous state so it won't
         # interfere.
-        $state{$1} = undef;
-    } elsif ($text =~ /\(([^)]+)\): supplicant connection state:.*-> (.*)$/) {
-        # Wireless connection state transition.
+        $state{$1} = "";
+    } elsif ($text =~ /\(([^)]+)\): supplicant (?:connection|interface) state: \S+ -> (\S+)/ ||
+             $text =~ /\(([^)]+)\): device state change: \S+ -> (\S+)/) {
+        # NetworkManager logs state transitions with the above
+        # messages, but the really important part is that we
+        # accurately log the state changes *to* and *from*
+        # "associating" (for the next case). Hence the safest bet
+        # seems to be to deal with all observed types of transitions
+        # that NetworkManager logs.
         $state{$1} = $2;
     } elsif ($text =~ /Activation \(([^)]+)\/[^)]*\): association took too long/) {
         # Wireless connection failure. If it happens during