Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 175783 | Differences between
and this patch

Collapse All | Expand All

(-)mysql (-3 / +11 lines)
Lines 27-35 Link Here
27
		return 1
27
		return 1
28
	fi
28
	fi
29
29
30
	local pidfile=$(get_config "${MY_CNF}" pid-file)
31
	local basedir=$(get_config "${MY_CNF}" basedir)
30
	local basedir=$(get_config "${MY_CNF}" basedir)
32
	local datadir=$(get_config "${MY_CNF}" datadir)
31
	local datadir=$(get_config "${MY_CNF}" datadir)
32
	local pidfile=$(get_config "${MY_CNF}" pid-file)
33
	local socket=$(get_config "${MY_CNF}" socket)
33
34
34
	if [ ! -d "${datadir}" ] ; then
35
	if [ ! -d "${datadir}" ] ; then
35
		eerror "MySQL datadir \`${datadir}' is empty or invalid"
36
		eerror "MySQL datadir \`${datadir}' is empty or invalid"
Lines 42-55 Link Here
42
		eerror "Please run /usr/bin/mysql_install_db to have this done..."
43
		eerror "Please run /usr/bin/mysql_install_db to have this done..."
43
		return 1
44
		return 1
44
	fi
45
	fi
45
			
46
46
	start-stop-daemon \
47
	start-stop-daemon \
47
		--start \
48
		--start \
48
		--exec "${basedir}"/sbin/mysqld \
49
		--exec "${basedir}"/sbin/mysqld \
49
		--pidfile "${pidfile}" \
50
		--pidfile "${pidfile}" \
50
		--background \
51
		--background \
51
		-- --defaults-file="${MY_CNF}" ${MY_ARGS}
52
		-- --defaults-file="${MY_CNF}" ${MY_ARGS}
52
	eend $? || return $?
53
	local ret=$?
54
	if [ ${ret} -ne 0 ] ; then
55
		eend ${ret}
56
		return ${ret}
57
	fi
58
59
	ewaitfile 60 "${socket}"
60
	eend $? || return 1
53
61
54
	save_options pidfile "${pidfile}"
62
	save_options pidfile "${pidfile}"
55
	save_options basedir "${basedir}"
63
	save_options basedir "${basedir}"

Return to bug 175783