From 1408c26e5cd679e29dcfa403ef65c5ac25547b58 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Mon, 17 Mar 2014 18:44:06 +0100 Subject: [PATCH] icinga2-{disable,enable}-feature should check if "ln" worked. Fixes #5753 --- tools/icinga2-enable-feature.cmake | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/icinga2-enable-feature.cmake b/tools/icinga2-enable-feature.cmake index 38026d6e7..1424fdf89 100644 --- a/tools/icinga2-enable-feature.cmake +++ b/tools/icinga2-enable-feature.cmake @@ -49,18 +49,24 @@ if [ "$TOOL" = "icinga2-enable-feature" ]; then exit 0 fi - ln -s ../features-available/$FEATURE.conf $ICINGA2CONFDIR/features-enabled/ - - echo "Module '$FEATURE' was enabled." + if ! ln -s ../features-available/$FEATURE.conf $ICINGA2CONFDIR/features-enabled/; then + echo "Enabling '$FEATURE' failed. Check permissions for $ICINGA2CONFDIR/features-enabled/" + exit 1 + else + echo "Module '$FEATURE' was enabled." + fi elif [ "$TOOL" = "icinga2-disable-feature" ]; then if [ ! -e $ICINGA2CONFDIR/features-enabled/$FEATURE.conf ]; then echo "The feature '$FEATURE' is already disabled." exit 0 fi - rm -f $ICINGA2CONFDIR/features-enabled/$FEATURE.conf - - echo "Module '$FEATURE' was disabled." + if ! rm -f $ICINGA2CONFDIR/features-enabled/$FEATURE.conf; then + echo "Disabling '$FEATURE' failed. Check permissions for $ICINGA2CONFDIR/features-enabled/$FEATURE.conf" + exit 1 + else + echo "Module '$FEATURE' was disabled." + fi fi echo "Make sure to restart Icinga 2 for these changes to take effect."