udev-ubuntu/arch-udev-rules.patch

   1 diff -Nur rules.d/50-udev-default.rules rules.d.arch/50-udev-default.rules
   2 --- rules.d/50-udev-default.rules       2009-03-07 22:22:48.200242883 +0100
   3 +++ rules.d.arch/50-udev-default.rules  2009-03-07 22:23:26.134434516 +0100
   4 @@ -64,20 +64,20 @@
   5
   6  # floppy
   7  KERNEL=="fd[0-9]", GROUP="floppy"
   8 -KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0640 -G floppy $root/%k"
   9 -KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitions"
  10 +KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0660 -G floppy $root/%k"
  11 +KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitions", GROUP="floppy"
  12
  13  # cdrom
  14 -SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="cdrom"
  15 -SUBSYSTEM=="block", KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", GROUP="cdrom"
  16 -SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom"
  17 -KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%k", GROUP="cdrom"
  18 -KERNEL=="pktcdvd", NAME="pktcdvd/control", GROUP="cdrom"
  19 +SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="optical", MODE="0660"
  20 +SUBSYSTEM=="block", KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", GROUP="optical", MODE="0660"
  21 +SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="optical", MODE="0660"
  22 +KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%k", GROUP="optical", MODE="0660"
  23 +KERNEL=="pktcdvd", NAME="pktcdvd/control", GROUP="optical", MODE="0660"
  24
  25  # tape
  26 -KERNEL=="ht[0-9]*|nht[0-9]*", GROUP="tape"
  27 -KERNEL=="pt[0-9]*|npt[0-9]*|pht[0-9]*", GROUP="tape"
  28 -SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape"
  29 +KERNEL=="ht[0-9]*|nht[0-9]*", GROUP="storage", MODE="0660"
  30 +KERNEL=="pt[0-9]*|npt[0-9]*|pht[0-9]*", GROUP="storage", MODE="0660"
  31 +SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="storage", MODE="0660"
  32
  33  # block-releated
  34  KERNEL=="sch[0-9]*", GROUP="disk"
  35 @@ -116,5 +116,4 @@
  36  KERNEL=="cpad[0-9]*",          NAME="usb/%k"
  37
  38  # do not delete static device nodes
  39 -ACTION=="remove", NAME=="?*", TEST=="/lib/udev/devices/$name", OPTIONS+="ignore_remove"
  40 -ACTION=="remove", NAME=="", TEST=="/lib/udev/devices/%k", OPTIONS+="ignore_remove"
  41 +ACTION=="remove", PROGRAM="ignore-remove.sh %r", OPTIONS+="ignore_remove"
  42 diff -Nur rules.d/60-persistent-storage.rules rules.d.arch/60-persistent-storage.rules
  43 --- rules.d/60-persistent-storage.rules 2009-03-07 22:22:48.200242883 +0100
  44 +++ rules.d.arch/60-persistent-storage.rules    2009-03-07 22:22:54.757744454 +0100
  45 @@ -10,7 +10,7 @@
  46  SUBSYSTEM!="block", GOTO="persistent_storage_end"
  47
  48  # skip rules for inappropriate block devices
  49 -KERNEL=="fd*|mtd*|nbd*|gnbd*|btibm*|dm-*|md*", GOTO="persistent_storage_end"
  50 +KERNEL=="fd*|mtd*|nbd*|gnbd*|md*|btibm*", GOTO="persistent_storage_end"
  51
  52  # never access non-cdrom removable ide devices, the drivers are causing event loops on open()
  53  KERNEL=="hd*[!0-9]", ATTR{removable}=="1", SUBSYSTEMS=="ide", ATTRS{media}=="disk|floppy", GOTO="persistent_storage_end"
  54 diff -Nur rules.d/80-drivers.rules rules.d.arch/80-drivers.rules
  55 --- rules.d/80-drivers.rules    2009-03-07 22:22:48.200242883 +0100
  56 +++ rules.d.arch/80-drivers.rules       2009-03-07 22:22:54.757744454 +0100
  57 @@ -2,13 +2,14 @@
  58
  59  ACTION!="add", GOTO="drivers_end"
  60
  61 -DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe -b $env{MODALIAS}"
  62 -SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/sbin/modprobe -b tifm_sd"
  63 -SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/sbin/modprobe -b tifm_ms"
  64 -SUBSYSTEM=="memstick", RUN+="/sbin/modprobe -b --all ms_block mspro_block"
  65 -SUBSYSTEM=="i2o", RUN+="/sbin/modprobe -b i2o_block"
  66 -SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe -b sg"
  67 -SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/sbin/modprobe -b ppdev"
  68 +DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/lib/udev/load-modules.sh $env{MODALIAS}"
  69 +SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/lib/udev/load-modules.sh tifm_sd"
  70 +SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/lib/udev/load-modules.sh tifm_ms"
  71 +SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh ms_block"
  72 +SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh mspro_block"
  73 +SUBSYSTEM=="i2o", RUN+="/lib/udev/load-modules.sh i2o_block"
  74 +SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/lib/udev/load-modules.sh sg"
  75 +SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/lib/udev/load-modules.sh ppdev"
  76
  77  LABEL="drivers_end"
  78