Browse Source

Benjamin Schieder:


			
			
				rocklinux
			
			
		
Benjamin Schieder 20 years ago
parent
commit
72904ba4a1
2 changed files with 23 additions and 27 deletions
  1. +14
    -22
      package/base/udev/scsi_dev_discs.patch
  2. +9
    -5
      package/base/udev/scsi_dev_discs_rules.patch

+ 14
- 22
package/base/udev/scsi_dev_discs.patch

@ -1,29 +1,21 @@
diff -pruN udev-063/etc/udev/debian/devfs.rules udev-063-patch/etc/udev/debian/devfs.rules
--- udev-063/etc/udev/debian/devfs.rules 2005-09-10 08:53:44.000000000 +0200
+++ udev-063-patch/etc/udev/debian/devfs.rules 2005-09-10 08:51:23.000000000 +0200
@@ -21,7 +21,7 @@ BUS=="ide", KERNEL=="hd[a-z]", SYSFS{rem
# IDE devices
BUS=="ide", KERNEL=="hd[a-z]*", \
PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", \
- NAME="%c{1}", SYMLINK+="%k %c{2}"
+ NAME="%c{1}", SYMLINK+="%k %c{2} %c{3}"
# SCSI devices
BUS=="scsi", PROGRAM="/etc/udev/scripts/scsi-devfs.sh %k %b %n", \
diff -pruN udev-063/extras/scsi-devfs.sh udev-063-patch/extras/scsi-devfs.sh
--- udev-063/extras/scsi-devfs.sh 2005-07-15 01:09:21.000000000 +0200
+++ udev-063-patch/extras/scsi-devfs.sh 2005-09-10 08:49:28.000000000 +0200
@@ -83,6 +83,12 @@ l_pci="domain$pci_domain/bus$pci_bus/slo
diff -pruN udev-068-orig/extras/scsi-devfs.sh udev-068/extras/scsi-devfs.sh
--- udev-068-orig/extras/scsi-devfs.sh 2005-10-11 17:33:26.000000000 +0200
+++ udev-068/extras/scsi-devfs.sh 2005-10-12 10:17:44.000000000 +0200
@@ -83,6 +83,16 @@ l_pci="domain$pci_domain/bus$pci_bus/slo
l_phy="bus/pci/$l_pci/scsi/$l_com"
s_phy="$1/pci/$pci_addr/$s_com"
-echo $l_phy $s_phy $l_log $s_log
+x=0
+while [ -e /dev/discs/disc$x ] ; do
+ [[ "`readlink /dev/discs/disc$x/disc`" = *${l_pci}* ]] && break
+ x=$(($x+1))
+for x in /dev/discs/disc* ; do
+ if readlink $x/disc | grep -q "$l_pci" ; then
+ x=`echo $x | cut -f3 -dc` # gives the number in disc0
+ break
+ fi
+ unset x
+done
+
+echo $l_phy $s_phy $l_log $s_log discs/disc${x}/${lpart}
+if [ -z "${x}" ] ; then
+ x="`ls /dev/discs/ | grep -c .`"
+fi
+echo $l_phy $s_phy $l_log $s_log discs/disc${x}/${lpart}

+ 9
- 5
package/base/udev/scsi_dev_discs_rules.patch

@ -1,8 +1,12 @@
diff -pruN udev-068/etc/udev/debian/devfs.rules udev-068-patch/etc/udev/debian/devfs.rules
--- udev-068/etc/udev/debian/devfs.rules 2005-08-18 19:04:49.000000000 +0200
+++ udev-068-patch/etc/udev/debian/devfs.rules 2005-09-13 10:20:27.000000000 +0200
@@ -24,8 +24,10 @@ BUS=="ide", KERNEL=="hd[a-z]*", \
NAME="%c{1}", SYMLINK+="%k %c{2}"
diff -pruN udev-068-orig/etc/udev/debian/devfs.rules udev-068/etc/udev/debian/devfs.rules
--- udev-068-orig/etc/udev/debian/devfs.rules 2005-10-11 17:33:26.000000000 +0200
+++ udev-068/etc/udev/debian/devfs.rules 2005-10-11 17:33:42.000000000 +0200
@@ -21,11 +21,13 @@ BUS=="ide", KERNEL=="hd[a-z]", SYSFS{rem
# IDE devices
BUS=="ide", KERNEL=="hd[a-z]*", \
PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", \
- NAME="%c{1}", SYMLINK+="%k %c{2}"
+ NAME="%c{1}", SYMLINK+="%k %c{2} %c{3}"
# SCSI devices
-BUS=="scsi", PROGRAM="/etc/udev/scripts/scsi-devfs.sh %k %b %n", \

Loading…
Cancel
Save