From d33fd9a1f8f449b9adbb433c7709383697feba9a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 6 Aug 2012 15:48:46 -0400
Subject: [PATCH] switch-to-configuration: Assume that services that are
 auto-restarting are going to fail

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

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index 6cedf7f2646..96b256bc24d 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -124,10 +124,10 @@ if (scalar @stopped > 0) {
 system("@systemd@/bin/systemctl", "reload", "dbus.service");
 
 # Print failed and new units.
-my (@failed, @new);
+my (@failed, @new, @restarting);
 my $activeNew = getActiveUnits;
 while (my ($unit, $state) = each %{$activeNew}) {
-    push @failed, $unit if $state->{state} eq "failed";
+    push @failed, $unit if $state->{state} eq "failed" || $state->{substate} eq "auto-restart";
     push @new, $unit if $state->{state} ne "failed" && !defined $activePrev->{$unit};
 }