Browse code

Merge "Don't special case Grenade + systemd"

Jenkins authored on 2017/08/16 11:33:00
Showing 1 changed files
... ...
@@ -174,10 +174,7 @@ fi
174 174
 # if we are forcing off USE_SCREEN (as we do in the gate), force on
175 175
 # systemd. This allows us to drop one of 3 paths through the code.
176 176
 if [[ "$USE_SCREEN" == "False" ]]; then
177
-    # Remove in Pike: this gets us through grenade upgrade
178
-    if [[ "$GRENADE_PHASE" != "target" ]]; then
179
-        USE_SYSTEMD="True"
180
-    fi
177
+    USE_SYSTEMD="True"
181 178
 fi
182 179
 
183 180
 # Default for log coloring is based on interactive-or-not.