r1004 - in trunk/utils/initrd-tools: . debian

[Martin Michlmayr]

Author: tbm
Date: 2004-08-11 06:17:12 -0600 (Wed, 11 Aug 2004)
New Revision: 1004

Modified:
   trunk/utils/initrd-tools/debian/changelog
   trunk/utils/initrd-tools/init
Log:
Handle changes to sysfs PCI IDE driver names which might come with 2.6.9.
Thanks to Herbert Xu (closes: #265011).


Modified: trunk/utils/initrd-tools/debian/changelog
===================================================================
--- trunk/utils/initrd-tools/debian/changelog	2004-08-11 08:43:28 UTC (rev 1003)
+++ trunk/utils/initrd-tools/debian/changelog	2004-08-11 12:17:12 UTC (rev 1004)
@@ -5,6 +5,8 @@
     - As of module-init-tools 3.1-pre2-1, /lib/modules/modprobe.conf
       doesn't exist anymore; handle both situations.  Thanks to Herbert
       Xu (closes: #255390).
+    - Handle changes to sysfs PCI IDE driver names which might come with
+      2.6.9.  Thanks to Herbert Xu (closes: #265011).
 
  -- Martin Michlmayr <tbm@cyrius.com>  Mon, 09 Aug 2004 14:37:17 +0100
 

Modified: trunk/utils/initrd-tools/init
===================================================================
--- trunk/utils/initrd-tools/init	2004-08-11 08:43:28 UTC (rev 1003)
+++ trunk/utils/initrd-tools/init	2004-08-11 12:17:12 UTC (rev 1004)
@@ -189,37 +189,37 @@
 	ret=$1
 	case $ret in
 	aec62xx)
-		ret='AEC62xx IDE'
+		ret='AEC62xx[ _]IDE'
 		;;
 	alim15x3)
-		ret='ALI15x3 IDE'
+		ret='ALI15x3[ _]IDE'
 		;;
 	amd74xx)
-		ret='AMD IDE'
+		ret='AMD[ _]IDE'
 		;;
 	atiixp)
-		ret='ATIIXP IDE'
+		ret='ATIIXP[ _]IDE'
 		;;
 	cmd64x)
-		ret='CMD64x IDE'
+		ret='CMD64x[ _]IDE'
 		;;
 	cs5520)
 		ret='CyrixIDE'
 		;;
 	cs5530)
-		ret='CS5530 IDE'
+		ret='CS5530[ _]IDE'
 		;;
 	cy82c693)
-		ret='Cypress IDE'
+		ret='Cypress[ _]IDE'
 		;;
 	generic)
-		ret='PCI IDE'
+		ret='PCI[ _]IDE'
 		;;
 	hpt34x)
-		ret='HPT34x IDE'
+		ret='HPT34x[ _]IDE'
 		;;
 	hpt366)
-		ret='HPT366 IDE'
+		ret='HPT366[ _]IDE'
 		;;
 	it8172)
 		ret='IT8172IDE'
@@ -228,46 +228,46 @@
 		ret='NS87415IDE'
 		;;
 	opti621)
-		ret='Opti621 IDE'
+		ret='Opti621[ _]IDE'
 		;;
 	pdc202xx_new)
-		ret='Promise IDE'
+		ret='Promise[ _]IDE'
 		;;
 	pdc202xx_old)
-		ret='Promise Old IDE'
+		ret='Promise[ _]Old[ _]IDE'
 		;;
 	piix)
-		ret='PIIX IDE'
+		ret='PIIX[ _]IDE'
 		;;
 	rz1000)
-		ret='RZ1000 IDE'
+		ret='RZ1000[ _]IDE'
 		;;
 	sc1200)
-		ret='SC1200 IDE'
+		ret='SC1200[ _]IDE'
 		;;
 	serverworks)
-		ret='Serverworks IDE'
+		ret='Serverworks[ _]IDE'
 		;;
 	siimage)
-		ret='SiI IDE'
+		ret='SiI[ _]IDE'
 		;;
 	sis5513)
-		ret='SIS IDE'
+		ret='SIS[ _]IDE'
 		;;
 	sl82c105)
-		ret='W82C105 IDE'
+		ret='W82C105[ _]IDE'
 		;;
 	slc90e66)
-		ret='SLC90e66 IDE'
+		ret='SLC90e66[ _]IDE'
 		;;
 	triflex)
-		ret='TRIFLEX IDE'
+		ret='TRIFLEX[ _]IDE'
 		;;
 	trm290)
-		ret='TRM290 IDE'
+		ret='TRM290[ _]IDE'
 		;;
 	via82cxxx)
-		ret='VIA IDE'
+		ret='VIA[ _]IDE'
 		;;
 	esac
 }
@@ -291,7 +291,9 @@
 			continue
 		fi
 
-		set -- /sys/bus/pci/drivers/"$ret"/*:*
+		IFS=''
+		set -- /sys/bus/pci/drivers/$ret/*:*
+		unset IFS
 		if [ ! -h "$1" ]; then
 			rmmod $i
 		fi