Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 536822
Collapse All | Expand All

(-)a/ChangeLog (+6 lines)
Lines 1-3 Link Here
1
2015-01-17  Ulrich Müller  <ulm@gentoo.org>
2
3
	* modules/rc.eselect: Be compatible with new OpenRC, bug 536822.
4
	(is_script): Test for "openrc-run" or "runscript" in shebang line.
5
	(run_runscript): Omit the interpreter when executing the script.
6
1
2014-09-01  Ulrich Müller  <ulm@gentoo.org>
7
2014-09-01  Ulrich Müller  <ulm@gentoo.org>
2
8
3
	* configure.ac: Update version to 1.4.3.
9
	* configure.ac: Update version to 1.4.3.
(-)a/modules/rc.eselect (-3 / +2 lines)
Lines 37-43 is_script() { Link Here
37
		&& ${file%%.sh} = ${file} \
37
		&& ${file%%.sh} = ${file} \
38
		&& ${file%%\~} = ${file} \
38
		&& ${file%%\~} = ${file} \
39
		&& -e ${file} ]] \
39
		&& -e ${file} ]] \
40
		&& grep "^#\!/sbin/runscript" "${file}" &>/dev/null
40
		&& grep '^#!.*/\(runscript\|openrc-run\)' "${file}" &>/dev/null
41
}
41
}
42
42
43
# find_scripts PRIVATE
43
# find_scripts PRIVATE
Lines 92-98 run_runscript() { Link Here
92
	shift
92
	shift
93
	for script; do
93
	for script; do
94
		is_script "${EROOT}/etc/init.d/${script}" \
94
		is_script "${EROOT}/etc/init.d/${script}" \
95
			&& /sbin/runscript "${EROOT}/etc/init.d/${script}" "${command}"
95
			&& "${EROOT}/etc/init.d/${script}" "${command}"
96
	done
96
	done
97
}
97
}
98
98
99
- 

Return to bug 536822