Merge "Don't special case Grenade + systemd"
This commit is contained in:
commit
371e6e1055
3
stackrc
3
stackrc
@ -174,11 +174,8 @@ fi
|
||||
# if we are forcing off USE_SCREEN (as we do in the gate), force on
|
||||
# systemd. This allows us to drop one of 3 paths through the code.
|
||||
if [[ "$USE_SCREEN" == "False" ]]; then
|
||||
# Remove in Pike: this gets us through grenade upgrade
|
||||
if [[ "$GRENADE_PHASE" != "target" ]]; then
|
||||
USE_SYSTEMD="True"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Default for log coloring is based on interactive-or-not.
|
||||
# Baseline assumption is that non-interactive invocations are for CI,
|
||||
|
Loading…
Reference in New Issue
Block a user