[gentoo-commits] gentoo-x86 commit in sys-apps/pciutils/files: init.d-pciparm

[Robin H. Johnson (robbat2)]

robbat2     08/10/08 21:04:16

  Modified:             init.d-pciparm
  Log:
  Simplify pciparm init code based partially on old suggestions from Uberlord and also from SteveL, causes no changes in end result.
  (Portage version: 2.2_rc11/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64)

Revision  Changes    Path
1.2                  sys-apps/pciutils/files/init.d-pciparm

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/pciutils/files/init.d-pciparm?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/pciutils/files/init.d-pciparm?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/pciutils/files/init.d-pciparm?r1=1.1&r2=1.2

Index: init.d-pciparm
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/pciutils/files/init.d-pciparm,v
retrieving revision 1.1
retrieving revision 1.2
diff -p -w -b -B -u -u -r1.1 -r1.2
--- init.d-pciparm	7 Oct 2008 11:07:09 -0000	1.1
+++ init.d-pciparm	8 Oct 2008 21:04:16 -0000	1.2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/files/init.d-pciparm,v 1.1 2008/10/07 11:07:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/files/init.d-pciparm,v 1.2 2008/10/08 21:04:16 robbat2 Exp $
 
 depend() {
 	before bootmisc hdparm
@@ -46,6 +46,18 @@ do_setpci() {
 	SPEC_ID=""
 }
 
+do_setpci_array() {
+	name=$1
+	shift
+	i=0
+	while true; do
+		eval opt="\$${name}_$i"
+		[[ -z "$opt" ]] && break
+		do_setpci "$*" $opt
+		i=$(($i+1))
+	done
+}
+
 start() {
 	if get_bootparam "nopciparm" ; then
 		ewarn "Skipping pciparm init as requested in kernel cmdline"
@@ -54,23 +66,9 @@ start() {
 
 	checkconfig || return 1
 	
-	if [ -n "$PCIPARM_ALL" ]; then
+	[[ -n "$PCIPARM_ALL" ]] && \
 		do_setpci -d '*:*' $PCIPARM_ALL
-	fi
 
-	SEQ_BUS=0
-	while true; do
-		BUS_OPT=`eval echo '$'PCIPARM_BUS_${SEQ_BUS}`
-		[[ -z "$BUS_OPT" ]] && break
-		do_setpci -s $BUS_OPT
-		SEQ_BUS=$(($SEQ_BUS+1))
-	done
-
-	SEQ_VENDOR=0
-	while true; do
-		VENDOR_OPT=`eval echo '$'PCIPARM_VENDOR_${SEQ_VENDOR}`
-		[[ -z "$VENDOR_OPT" ]] && break
-		do_setpci -d $VENDOR_OPT
-		SEQ_VENDOR=$(($SEQ_VENDOR+1))
-	done
+	do_setpci_array PCIPARM_BUS -s
+	do_setpci_array PCIPARM_VENDOR -d
 }