Cleanup service files (#483526)

(Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 18 insertions, 42 deletions

diff --git a/dev-db/mysql-init-scripts/ChangeLog b/dev-db/mysql-init-scripts/ChangeLog
index 9f4784850d09..96793248902e 100644
--- a/dev-db/mysql-init-scripts/ChangeLog
+++ b/dev-db/mysql-init-scripts/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/mysql-init-scripts
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog,v 1.29 2013/09/19 08:46:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog,v 1.30 2013/09/21 14:44:00 pacho Exp $
+
+*mysql-init-scripts-2.0_pre1-r6 (21 Sep 2013)
+
+  21 Sep 2013; Pacho Ramos <pacho@gentoo.org>
+  +mysql-init-scripts-2.0_pre1-r6.ebuild,
+  -mysql-init-scripts-2.0_pre1-r5.ebuild, files/mysqld.service,
+  files/mysqld_at.service:
+  Cleanup service files (#483526)
 
 *mysql-init-scripts-2.0_pre1-r5 (19 Sep 2013)
 
diff --git a/dev-db/mysql-init-scripts/files/mysqld.service b/dev-db/mysql-init-scripts/files/mysqld.service
index 8cce47ace709..de9ea2f1ec31 100644
--- a/dev-db/mysql-init-scripts/files/mysqld.service
+++ b/dev-db/mysql-init-scripts/files/mysqld.service
@@ -1,22 +1,3 @@
-# It's not recommended to modify this file in-place, because it will be
-# overwritten during package upgrades.  If you want to customize, the
-# best way is to create a file "/etc/systemd/system/mysqld.service",
-# containing
-#	.include /lib/systemd/system/mysqld.service
-#	...make your changes here...
-# For more info about custom unit files, see
-# http://fedoraproject.org/wiki/Systemd#How_do_I_customize_a_unit_file.2F_add_a_custom_unit_file.3F
-
-# For example, if you want to increase mysql's open-files-limit to 10000,
-# you need to increase systemd's LimitNOFILE setting, so create a file named
-# "/etc/systemd/system/mysqld.service" containing:
-#	.include /lib/systemd/system/mysqld.service
-#	[Service]
-#	LimitNOFILE=10000
-
-# Note: in F-17 and beyond, /usr/lib/... is recommended in the .include line
-# though /lib/... will still work.
-
 [Unit]
 Description=MySQL database server
 After=syslog.target
@@ -28,13 +9,16 @@ User=mysql
 Group=mysql
 
 # Note: we set --basedir to prevent probes that might trigger SELinux alarms,
-# per bug #547485
+# https://bugzilla.redhat.com/show_bug.cgi?id=547485
 ExecStart=/usr/bin/mysqld_safe --basedir=/usr
 ExecStartPost=/usr/libexec/mysqld-wait-ready $MAINPID
 
 # Give a reasonable amount of time for the server to start up/shut down
 TimeoutSec=300
 
+# We rely on systemd, not mysqld_safe, to restart mysqld if it dies
+Restart=always
+
 # Place temp files in a secure directory, not /tmp
 PrivateTmp=true
 
diff --git a/dev-db/mysql-init-scripts/files/mysqld_at.service b/dev-db/mysql-init-scripts/files/mysqld_at.service
index 1ba2a8f8a2d0..f46cf9e3ebf0 100644
--- a/dev-db/mysql-init-scripts/files/mysqld_at.service
+++ b/dev-db/mysql-init-scripts/files/mysqld_at.service
@@ -1,22 +1,3 @@
-# It's not recommended to modify this file in-place, because it will be
-# overwritten during package upgrades.  If you want to customize, the
-# best way is to create a file "/etc/systemd/system/mysqld.service",
-# containing
-#	.include /lib/systemd/system/mysqld.service
-#	...make your changes here...
-# For more info about custom unit files, see
-# http://fedoraproject.org/wiki/Systemd#How_do_I_customize_a_unit_file.2F_add_a_custom_unit_file.3F
-
-# For example, if you want to increase mysql's open-files-limit to 10000,
-# you need to increase systemd's LimitNOFILE setting, so create a file named
-# "/etc/systemd/system/mysqld.service" containing:
-#	.include /lib/systemd/system/mysqld.service
-#	[Service]
-#	LimitNOFILE=10000
-
-# Note: in F-17 and beyond, /usr/lib/... is recommended in the .include line
-# though /lib/... will still work.
-
 [Unit]
 Description=MySQL database server
 ConditionPathExists=/etc/mysql/my%I.cnf
@@ -28,13 +9,16 @@ User=mysql
 Group=mysql
 
 # Note: we set --basedir to prevent probes that might trigger SELinux alarms,
-# per bug #547485
+# https://bugzilla.redhat.com/show_bug.cgi?id=547485
 ExecStart=/usr/bin/mysqld_safe --defaults-file=/etc/mysql/my%I.cnf --basedir=/usr
 ExecStartPost=/usr/libexec/mysqld-wait-ready $MAINPID
 
 # Give a reasonable amount of time for the server to start up/shut down
 TimeoutSec=300
 
+# We rely on systemd, not mysqld_safe, to restart mysqld if it dies
+Restart=always
+
 # Place temp files in a secure directory, not /tmp
 PrivateTmp=true
 
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r5.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r6.ebuild
index 80260edce212..313b52a5ded3 100644
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r5.ebuild
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r5.ebuild,v 1.1 2013/09/19 08:46:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r6.ebuild,v 1.1 2013/09/21 14:43:59 pacho Exp $
 
 inherit systemd