[gentoo-commits] eselect r476 - in trunk: . modules

[Ulrich Mueller (ulm)]

Author: ulm
Date: 2009-04-20 15:00:33 +0000 (Mon, 20 Apr 2009)
New Revision: 476

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/modules/rc.eselect
Log:
Make rc module work with OpenRC, fixes bug 180966.

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-04-20 12:51:42 UTC (rev 475)
+++ trunk/ChangeLog	2009-04-20 15:00:33 UTC (rev 476)
@@ -1,5 +1,12 @@
 2009-04-20  Ulrich Mueller  <ulm@g.o>
 
+	* modules/rc.eselect (source_rc_functions, get_runlevel):
+	New functions for OpenRC (and baselayout-1) support.
+	(RC_SVCDIR, rc_svcdir): Removed.
+	(do_show): Function completely rewritten; use the common API
+	of baselayout-1 and OpenRC. Thanks to Sebastian Günther
+	<samson@××××××××××××××××.de> in bug 180966.
+
 	* libs/editor-variable.bash.in:
 	* modules/editor.eselect:
 	* modules/visual.eselect:

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2009-04-20 12:51:42 UTC (rev 475)
+++ trunk/NEWS	2009-04-20 15:00:33 UTC (rev 476)
@@ -5,6 +5,7 @@
     Bug fixes:
     - Fixed bug #155814: Clear aliases and shell functions.
     - Fixed bug #156866: Handle missing scripts in rc module.
+    - Fixed bug #180966: Make rc module work with OpenRC.
     - Various improvements in opengl module.
 
     New features:

Modified: trunk/modules/rc.eselect
===================================================================
--- trunk/modules/rc.eselect	2009-04-20 12:51:42 UTC (rev 475)
+++ trunk/modules/rc.eselect	2009-04-20 15:00:33 UTC (rev 476)
@@ -9,13 +9,28 @@
 SVN_DATE='$Date$'
 VERSION=$(svn_date_to_version "${SVN_DATE}")
 
-# default setting
-RC_SVCDIR=/var/lib/init.d/
+# source_rc_functions PRIVATE
+# API for OpenRC or baselayout-1
+source_rc_functions() {
+	[[ ${RC_GOT_FUNCTIONS} = yes ]] && return
+	source /etc/init.d/functions.sh || die "Failed to source functions.sh"
+	# baselayout-1 compatibility
+	if [[ -e ${svclib}/sh/rc-services.sh ]]; then
+		source "${svclib}/sh/rc-services.sh" \
+			|| die "Failed to source rc-services.sh"
+	fi
+}
 
-# return actual rc service directory
-rc_svcdir() {
-	local ret=$(load_config ${ROOT}/etc/conf.d/rc svcdir)
-	echo ${ret:-${RC_SVCDIR}}
+# get_runlevel PRIVATE
+# determine the current runlevel
+get_runlevel() {
+	if type rc_runlevel &>/dev/null; then
+		rc_runlevel || die "rc_runlevel failed"
+	elif [[ -n ${SOFTLEVEL} ]]; then
+		echo "${SOFTLEVEL}"
+	else
+		die "Cannot determine runlevel"
+	fi
 }
 
 # list_runlevels PRIVATE
@@ -194,19 +209,36 @@
 }
 
 do_show() {
-	local softlevel=$(< "$(rc_svcdir)"/softlevel) script stopped
-	local runlevel=${1:-${softlevel}}
-	write_list_start "Status of init scripts in runlevel $(highlight ${runlevel})"
-	for script in $(find_scripts ${ROOT}/etc/runlevels/${runlevel}) ; do
-		stopped=true
-		for x in started starting stopping failed broken ; do
-			if [[ -L ${ROOT}/$(rc_svcdir)/${x}/${script} ]] ; then
-				write_kv_list_entry ${script} "[${x}]"
-				stopped=false
-			fi
+	# subshell to avoid pollution of caller's environment
+	(
+		# core.bash redefines eval; unset it because OpenRC's
+		# functions.sh needs the bash builtin
+		unset -f eval
+		source_rc_functions
+		runlevel=$(get_runlevel)
+		write_list_start \
+			"Status of init scripts in runlevel \"${runlevel}\""
+		for script in $(find_scripts "${ROOT}/etc/runlevels/${runlevel}"); do
+			for x in stopping starting inactive started stopped; do
+				if service_${x} ${script}; then
+					case ${x} in
+						starting|inactive)
+							write_kv_list_entry ${script} \
+								"$(highlight_warning [${x}])"
+							;;
+						started)
+							write_kv_list_entry ${script} "$(highlight [${x}])"
+							;;
+						*)
+							write_kv_list_entry ${script} [${x}]
+							;;
+					esac
+					continue 2
+				fi
+			done
+			write_kv_list_entry ${script} "$(highlight_warning [unknown])"
 		done
-		[[ ${stopped} == true ]] && write_kv_list_entry ${script} "[stopped]"
-	done
+	)
 }
 
 ### start action