From 42b95bd00fcf267d0a6894bf6a15fa269e21238d Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Wed, 21 Sep 2022 22:30:40 +0000 Subject: [PATCH] fixup svd: dont do set +e --- modules/environment/login/login-inner.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/modules/environment/login/login-inner.nix b/modules/environment/login/login-inner.nix index c6e18a9..0a49fa8 100644 --- a/modules/environment/login/login-inner.nix +++ b/modules/environment/login/login-inner.nix @@ -17,14 +17,9 @@ writeText "login-inner" '' fi ${lib.optionalString config.supervisord.enable '' - set +e if [ ! -e "${config.supervisord.socketPath}" ]; then - ${config.supervisord.package}/bin/supervisord -c /etc/supervisord.conf - if [ $? != 0 ]; then - echo "Warning: supervisord failed to start" - fi + ${config.supervisord.package}/bin/supervisord -c /etc/supervisord.conf || echo "Warning: supervisord failed to start" fi - set -e ''} ${lib.optionalString config.build.initialBuild ''