From e053f04cf61c3406bf5a10a5da8c7bb7b856f6c0 Mon Sep 17 00:00:00 2001 From: Enderson Maia Date: Wed, 15 Jul 2015 17:31:01 -0300 Subject: [PATCH] Fixed bug introduced in PR-182 If you disable the installation of all services, you could have a != 0 output, and break the `docker build` process. --- image/system_services.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/image/system_services.sh b/image/system_services.sh index cdcab5b..da8d275 100755 --- a/image/system_services.sh +++ b/image/system_services.sh @@ -20,10 +20,10 @@ ln -s /etc/container_environment.sh /etc/profile.d/ $minimal_apt_get_install runit ## Install a syslog daemon and logrotate. -[ "$DISABLE_SYSLOG" -eq 0 ] && /bd_build/services/syslog-ng/syslog-ng.sh +[ "$DISABLE_SYSLOG" -eq 0 ] && /bd_build/services/syslog-ng/syslog-ng.sh || true ## Install the SSH server. -[ "$DISABLE_SSH" -eq 0 ] && /bd_build/services/sshd/sshd.sh +[ "$DISABLE_SSH" -eq 0 ] && /bd_build/services/sshd/sshd.sh || true ## Install cron daemon. -[ "$DISABLE_CRON" -eq 0 ] && /bd_build/services/cron/cron.sh +[ "$DISABLE_CRON" -eq 0 ] && /bd_build/services/cron/cron.sh || true