Attachment 832221 Details for Bug 1037650 – proposed patch that uses fuser call

[patch] proposed patch that uses fuser call

mysql-rhbz1037650.patch (text/plain), 1.72 KB, created by Honza Horak on 2013-12-03 17:48:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Honza Horak

Created: 2013-12-03 17:48:18 UTC

Size: 1.72 KB

patch

obsolete

>diff --git a/mysql.init b/mysql.init
>index 90b4dc6..d41fe96 100644
>--- a/mysql.init
>+++ b/mysql.init
>@@ -108,6 +108,15 @@ start(){
> 	fi
> 	chown mysql:mysql "$datadir"
> 	chmod 0755 "$datadir"
>+	# We check if there is already a process using the socket file,
>+	# since otherwise this init script could report false positive
>+	# result and mysqld_safe would remove the socket file, which
>+	# actually uses a different daemon.
>+	if fuser "$socketfile" &>/dev/null ; then
>+	    echo "Socket file $socketfile exists. Is another MySQL daemon already running with the same unix socket?"
>+	    action $"Starting $prog: " /bin/false
>+	    return 1
>+	fi
> 	# Pass all the options determined above, to ensure consistent behavior.
> 	# In many cases mysqld_safe would arrive at the same conclusions anyway
> 	# but we need to be sure.  (An exception is that we don't force the
>@@ -115,11 +124,6 @@ start(){
> 	# and some users might prefer to configure logging to syslog.)
> 	# Note: set --basedir to prevent probes that might trigger SELinux
> 	# alarms, per bug #547485
>-	if [ -S "$socketfile" ] ; then
>-	    echo "Another MySQL daemon already running with the same unix socket."
>-	    action $"Starting $prog: " /bin/false
>-	    return 1
>-	fi
> 	$exec   --datadir="$datadir" --socket="$socketfile" \
> 		--pid-file="$mypidfile" \
> 		--basedir=/usr --user=mysql >/dev/null 2>&1 &
>diff --git a/mysql.spec b/mysql.spec
>index 64d3ec8..184771a 100644
>--- a/mysql.spec
>+++ b/mysql.spec
>@@ -100,7 +100,7 @@ MySQL server.
> Summary: The MySQL server and related files
> Group: Applications/Databases
> Requires: %{name} = %{version}-%{release}
>-Requires: sh-utils
>+Requires: sh-utils, /sbin/fuser
> Requires(pre): /usr/sbin/useradd
> Requires(post): chkconfig
> Requires(preun): chkconfig

Flags:

lhh: review+

Actions: View | Diff

Attachments on bug 1037650: 832221