This is an automated email from the ASF dual-hosted git repository.
sureshanaparti pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.16 by this push:
new 28f6067 packaging: use modern systemctl enable/disable (#5881)
28f6067 is described below
commit 28f6067f3cb43e15e22817de4ae26741726a4c22
Author: Rohit Yadav <[email protected]>
AuthorDate: Thu Jan 27 04:23:16 2022 +0000
packaging: use modern systemctl enable/disable (#5881)
This fixes spec files to use systemctl enable|disable instead of on|off.
Signed-off-by: Rohit Yadav <[email protected]>
---
packaging/centos7/cloud.spec | 4 ++--
packaging/centos8/cloud.spec | 4 ++--
packaging/suse15/cloud.spec | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 0728f58..0e2a594 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -400,7 +400,7 @@ install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-inte
%preun management
/usr/bin/systemctl stop cloudstack-management || true
-/usr/bin/systemctl off cloudstack-management || true
+/usr/bin/systemctl disable cloudstack-management || true
%pre management
id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -U -c "CloudStack
unprivileged user" \
@@ -431,7 +431,7 @@ pip3 install
%{_datadir}/%{name}-management/setup/wheel/six-1.15.0-py2.py3-none-
pip3 install urllib3
-/usr/bin/systemctl on cloudstack-management > /dev/null 2>&1 || true
+/usr/bin/systemctl enable cloudstack-management > /dev/null 2>&1 || true
grep -s -q "db.cloud.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e
"\$adb.cloud.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties"
grep -s -q "db.usage.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e
"\$adb.usage.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties"
diff --git a/packaging/centos8/cloud.spec b/packaging/centos8/cloud.spec
index 31d85dd..8088ff4 100644
--- a/packaging/centos8/cloud.spec
+++ b/packaging/centos8/cloud.spec
@@ -393,7 +393,7 @@ install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-inte
%preun management
/usr/bin/systemctl stop cloudstack-management || true
-/usr/bin/systemctl off cloudstack-management || true
+/usr/bin/systemctl disable cloudstack-management || true
%pre management
id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -U -c "CloudStack
unprivileged user" \
@@ -422,7 +422,7 @@ fi
# Install mysql-connector-python
pip3 install
%{_datadir}/%{name}-management/setup/wheel/six-1.15.0-py2.py3-none-any.whl
%{_datadir}/%{name}-management/setup/wheel/setuptools-47.3.1-py3-none-any.whl
%{_datadir}/%{name}-management/setup/wheel/protobuf-3.12.2-cp36-cp36m-manylinux1_x86_64.whl
%{_datadir}/%{name}-management/setup/wheel/mysql_connector_python-8.0.20-cp36-cp36m-manylinux1_x86_64.whl
-/usr/bin/systemctl on cloudstack-management > /dev/null 2>&1 || true
+/usr/bin/systemctl enable cloudstack-management > /dev/null 2>&1 || true
grep -s -q "db.cloud.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e
"\$adb.cloud.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties"
grep -s -q "db.usage.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e
"\$adb.usage.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties"
diff --git a/packaging/suse15/cloud.spec b/packaging/suse15/cloud.spec
index 30300c6..7e5c38f 100644
--- a/packaging/suse15/cloud.spec
+++ b/packaging/suse15/cloud.spec
@@ -395,7 +395,7 @@ install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-inte
%preun management
/usr/bin/systemctl stop cloudstack-management || true
-/usr/bin/systemctl off cloudstack-management || true
+/usr/bin/systemctl disable cloudstack-management || true
%pre management
id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -U -c "CloudStack
unprivileged user" \
@@ -424,7 +424,7 @@ fi
# Install mysql-connector-python
pip3 install
%{_datadir}/%{name}-management/setup/wheel/six-1.15.0-py2.py3-none-any.whl
%{_datadir}/%{name}-management/setup/wheel/setuptools-47.3.1-py3-none-any.whl
%{_datadir}/%{name}-management/setup/wheel/protobuf-3.12.2-cp36-cp36m-manylinux1_x86_64.whl
%{_datadir}/%{name}-management/setup/wheel/mysql_connector_python-8.0.20-cp36-cp36m-manylinux1_x86_64.whl
-/usr/bin/systemctl on cloudstack-management > /dev/null 2>&1 || true
+/usr/bin/systemctl enable cloudstack-management > /dev/null 2>&1 || true
grep -s -q "db.cloud.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e
"\$adb.cloud.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties"
grep -s -q "db.usage.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e
"\$adb.usage.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties"
