common/rc: Introduce _get_kernel_option()

Move the code for parsing the kernel configuration file from
tests/scsi/007 into common/rc. No functionality has been changed.

Signed-off-by: Bart Van Assche <[email protected]>

Author: bvanassche

common/rc

@@ -198,20 +198,33 @@ _have_kernel_config_file() {
 	return 0
 }
 
-# Check if the specified kernel option is defined.
-_check_kernel_option() {
-	local f opt=$1
+# Retrieve the value of kernel option $1.
+_get_kernel_option() {
+	local f opt=$1 result
 
 	for f in /proc/config.gz /boot/config-$(uname -r); do
 		[ -e "$f" ] || continue
-		if zgrep -q "^CONFIG_${opt}=[my]$" "$f"; then
+		if result=$(zgrep "^CONFIG_${opt}=" "$f"); then
+			echo "${result#*=}"
 			return 0
 		fi
 	done
 
 	return 1
 }
 
+# Check if kernel option $1 is defined.
+_check_kernel_option() {
+	local value
+
+	case "$(_get_kernel_option "$1")" in
+		y|m)
+			return 0;;
+	esac
+
+	return 1
+}
+
 # Combine _have_kernel_config_file() and _check_kernel_option().
 # Set SKIP_REASONS when _check_kernel_option() returns false.
 _have_kernel_option() {

tests/scsi/007

@@ -15,14 +15,6 @@ requires() {
 	_have_module scsi_debug
 }
 
-config_hz() {
-	if [ -e /proc/config.gz ]; then
-		zcat /proc/config.gz
-	else
-		cat "/boot/config-$(uname -r)"
-	fi | sed -n 's/^CONFIG_HZ=//p'
-}
-
 test() {
 	local dev freq delay_s jdelay
 
@@ -42,7 +34,7 @@ test() {
 	echo "I/O timeout = $(<"/sys/class/block/$dev/queue/io_timeout")" >>"$FULL"
         # Change the scsi_debug delay to 3 seconds.
 	delay_s=3
-        freq=$(config_hz)
+        freq=$(_get_kernel_option HZ)
         jdelay=$((delay_s * "${freq}"))
         echo "CONFIG_HZ=${freq} jdelay=${jdelay}" >>"$FULL"
 	echo "$jdelay" > /sys/module/scsi_debug/parameters/delay