Bug#265011: initrd-tools: Handle change to sysfs PCI IDE driver names
Package: initrd-tools
Version: 0.1.71
Severity: normal
This is a preemptive patch to deal with upcoming changes to the PCI
IDE driver names exported via sysfs. This may appear as early as
2.6.9.
Thanks,
-- System Information
Debian Release: testing/unstable
Kernel Version: Linux gondolin 2.4.26-1-686-smp #1 SMP Sat May 1 19:17:11 EST 2004 i686 GNU/Linux
Versions of the packages initrd-tools depends on:
ii coreutils 5.0.91-2 The GNU core utilities
ii cpio 2.5-1.1 GNU cpio -- a program to manage archives of
ii cramfsprogs 1.1-6 Tools for CramFs (Compressed ROM File System
ii dash 0.4.26-3 The Debian Almquist Shell
ii fileutils 5.0.91-2 The GNU file management utilities (transitio
ii util-linux 2.12-3 Miscellaneous system utilities
stat Not installed or no info
--
Index: init
===================================================================
RCS file: /home/gondolin/herbert/src/CVS/debian/initrd-tools/init,v
retrieving revision 1.56
diff -u -r1.56 init
--- init 18 May 2004 10:48:15 -0000 1.56
+++ init 11 Aug 2004 11:39:32 -0000
@@ -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
Reply to: