Merge ".conf suffix for the horizon config on Fedora"
diff --git a/functions b/functions
index 37876e0..41f008e 100644
--- a/functions
+++ b/functions
@@ -912,7 +912,7 @@
fi
if [[ "$os_PACKAGE" = "deb" ]]; then
- dpkg -l "$@" > /dev/null
+ dpkg -l "$@" > /dev/null 2> /dev/null
elif [[ "$os_PACKAGE" = "rpm" ]]; then
rpm --quiet -q "$@"
else
@@ -1063,7 +1063,7 @@
sleep 1.5
NL=`echo -ne '\015'`
- screen -S $SCREEN_NAME -p $1 -X stuff "$2 || touch \"$SERVICE_DIR/$SCREEN_NAME/$1.failure\"$NL"
+ screen -S $SCREEN_NAME -p $1 -X stuff "$2 || echo \"$1 failed to start\" | tee \"$SERVICE_DIR/$SCREEN_NAME/$1.failure\"$NL"
else
# Spawn directly without screen
run_process "$1" "$2" >$SERVICE_DIR/$SCREEN_NAME/$service.pid
diff --git a/lib/oslo b/lib/oslo
index 449c4de..f77a4fa 100644
--- a/lib/oslo
+++ b/lib/oslo
@@ -40,12 +40,12 @@
# cleanup_oslo() - purge possibly old versions of oslo
function cleanup_oslo() {
- # this means we've got an old olso installed, lets get rid of it
+ # this means we've got an old oslo installed, lets get rid of it
if ! python -c 'import oslo.config' 2>/dev/null; then
echo "Found old oslo.config... removing to ensure consistency"
local PIP_CMD=$(get_pip_command)
- pip_install olso.config
- sudo $PIP_CMD uninstall -y olso.config
+ pip_install oslo.config
+ sudo $PIP_CMD uninstall -y oslo.config
fi
}