Merge remote-tracking branch 'origin/4.11' into 4.12

This commit is contained in:
Rohit Yadav 2019-04-09 14:22:18 +05:30
commit 9488c6dcc5

View File

@ -431,6 +431,8 @@ if [ -f "%{_sysconfdir}/cloud.rpmsave/agent/agent.properties" ]; then
mv %{_sysconfdir}/cloud.rpmsave/agent/agent.properties %{_sysconfdir}/cloud.rpmsave/agent/agent.properties.rpmsave mv %{_sysconfdir}/cloud.rpmsave/agent/agent.properties %{_sysconfdir}/cloud.rpmsave/agent/agent.properties.rpmsave
fi fi
systemctl daemon-reload
%pre usage %pre usage
id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -c "CloudStack unprivileged user" \ id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -c "CloudStack unprivileged user" \
-r -s /bin/sh -d %{_localstatedir}/cloudstack/management cloud|| true -r -s /bin/sh -d %{_localstatedir}/cloudstack/management cloud|| true