Skip to content

Commit 28f6067

Browse files
authored
packaging: use modern systemctl enable/disable (apache#5881)
This fixes spec files to use systemctl enable|disable instead of on|off. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
1 parent 84f5768 commit 28f6067

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

packaging/centos7/cloud.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-inte
400400

401401
%preun management
402402
/usr/bin/systemctl stop cloudstack-management || true
403-
/usr/bin/systemctl off cloudstack-management || true
403+
/usr/bin/systemctl disable cloudstack-management || true
404404

405405
%pre management
406406
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-
431431

432432
pip3 install urllib3
433433

434-
/usr/bin/systemctl on cloudstack-management > /dev/null 2>&1 || true
434+
/usr/bin/systemctl enable cloudstack-management > /dev/null 2>&1 || true
435435

436436
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"
437437
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"

packaging/centos8/cloud.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-inte
393393

394394
%preun management
395395
/usr/bin/systemctl stop cloudstack-management || true
396-
/usr/bin/systemctl off cloudstack-management || true
396+
/usr/bin/systemctl disable cloudstack-management || true
397397

398398
%pre management
399399
id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -U -c "CloudStack unprivileged user" \
@@ -422,7 +422,7 @@ fi
422422
# Install mysql-connector-python
423423
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
424424

425-
/usr/bin/systemctl on cloudstack-management > /dev/null 2>&1 || true
425+
/usr/bin/systemctl enable cloudstack-management > /dev/null 2>&1 || true
426426

427427
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"
428428
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"

packaging/suse15/cloud.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-inte
395395

396396
%preun management
397397
/usr/bin/systemctl stop cloudstack-management || true
398-
/usr/bin/systemctl off cloudstack-management || true
398+
/usr/bin/systemctl disable cloudstack-management || true
399399

400400
%pre management
401401
id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -U -c "CloudStack unprivileged user" \
@@ -424,7 +424,7 @@ fi
424424
# Install mysql-connector-python
425425
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
426426

427-
/usr/bin/systemctl on cloudstack-management > /dev/null 2>&1 || true
427+
/usr/bin/systemctl enable cloudstack-management > /dev/null 2>&1 || true
428428

429429
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"
430430
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"

0 commit comments

Comments
 (0)