rpms/mariadb
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Use compatibility mysqld.service instead of link

Browse Source 
Related: #1014311
This commit is contained in:
Honza Horak 2014-01-17 10:34:51 +01:00
parent 73abdb8e5e
commit 9def760e7e
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mariadb.service
View File

@ -26,6 +26,7 @@
Description=MariaDB database server Description=MariaDB database server
After=syslog.target After=syslog.target
After=network.target After=network.target
BindsTo=mysqld.service
[Service] [Service]
Type=simple Type=simple
@ -46,3 +47,4 @@ PrivateTmp=true
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target
Also=mysqld.service

5
mariadb.spec
View File

@ -48,6 +48,7 @@ Source12: mariadb-prepare-db-dir
Source13: mariadb-wait-ready Source13: mariadb-wait-ready
Source14: rh-skipped-tests-base.list Source14: rh-skipped-tests-base.list
Source15: rh-skipped-tests-arm.list Source15: rh-skipped-tests-arm.list
Source16: mysqld.service
# Working around perl dependency checking bug in rpm FTTB. Remove later. # Working around perl dependency checking bug in rpm FTTB. Remove later.
Source999: filter-requires-mysql.sh Source999: filter-requires-mysql.sh
@ -461,7 +462,7 @@ install -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/my.cnf
# install systemd unit files and scripts for handling server startup # install systemd unit files and scripts for handling server startup
mkdir -p ${RPM_BUILD_ROOT}%{_unitdir} mkdir -p ${RPM_BUILD_ROOT}%{_unitdir}
install -p -m 644 %{SOURCE11} ${RPM_BUILD_ROOT}%{_unitdir}/ install -p -m 644 %{SOURCE11} ${RPM_BUILD_ROOT}%{_unitdir}/
ln -s mariadb.service ${RPM_BUILD_ROOT}%{_unitdir}/mysqld.service install -p -m 644 %{SOURCE16} ${RPM_BUILD_ROOT}%{_unitdir}/mysqld.service
install -p -m 755 %{SOURCE12} ${RPM_BUILD_ROOT}%{_libexecdir}/ install -p -m 755 %{SOURCE12} ${RPM_BUILD_ROOT}%{_libexecdir}/
install -p -m 755 %{SOURCE13} ${RPM_BUILD_ROOT}%{_libexecdir}/ install -p -m 755 %{SOURCE13} ${RPM_BUILD_ROOT}%{_libexecdir}/
@ -805,6 +806,8 @@ fi
* Tue Jan 14 2014 Honza Horak <hhorak@redhat.com> - 1:5.5.34-9 * Tue Jan 14 2014 Honza Horak <hhorak@redhat.com> - 1:5.5.34-9
- Adopt compatible system versioning - Adopt compatible system versioning
Related: #1045013 Related: #1045013
- Use compatibility mysqld.service instead of link
Related: #1014311
* Mon Jan 13 2014 Rex Dieter <rdieter@fedoraproject.org> 1:5.5.34-8 * Mon Jan 13 2014 Rex Dieter <rdieter@fedoraproject.org> 1:5.5.34-8
- move mysql_config alternatives scriptlets to -devel too - move mysql_config alternatives scriptlets to -devel too

12
mysqld.service Normal file
View File

@ -0,0 +1,12 @@
Unit]
Description=MySQL compatibility service (another name for mariadb.service; you should use mariadb.service instead)
BindsTo=mariadb.service
[Service]
Type=oneshot
ExecStart=/bin/true
RemainAfterExit=yes
[Install]
WantedBy=multi-user.target
Also=mariadb.service