[arch-commits] Commit in udev/trunk (PKGBUILD cdsymlinks.sh readme-udev-arch.txt)

[Tobias Powalowski]

    Date: Tuesday, March 17, 2009 @ 17:22:31
  Author: tpowa
Revision: 30241

upgpkg: udev 140-1

Modified:
  udev/trunk/PKGBUILD
  udev/trunk/cdsymlinks.sh
  udev/trunk/readme-udev-arch.txt

----------------------+
 PKGBUILD             |   13 +++++++------
 cdsymlinks.sh        |   11 +++++------
 readme-udev-arch.txt |   18 ++++--------------
 3 files changed, 16 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-17 21:00:46 UTC (rev 30240)
+++ PKGBUILD	2009-03-17 21:22:31 UTC (rev 30241)
@@ -3,7 +3,7 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 pkgname=udev
-pkgver=139
+pkgver=140
 pkgrel=1
 pkgdesc="The userspace dev tools (udev)"
 arch=(i686 x86_64)
@@ -25,14 +25,14 @@
 source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.bz2
         81-arch.rules load-modules.sh resolve-modalias.c cdsymlinks.sh root-link.sh
         arch-udev-rules.patch readme-udev-arch.txt ignore-remove.sh)
-md5sums=('7e705e237d29734c77bc26f6ccbc4594'
+md5sums=('7d1e5737a3557849eecd701a7fb068b4'
          'de602ae07903946c0bbd518ef48702b3'
          'f4951f61438d69894b728212dac7318b'
          'e0d7ab73ec42eb81947daf23e224c0fb'
-         '8424b78e9dd772e75b4ef90814807815'
+         'c090a2d58c4b9a227ad2f0675c6b54c1'
          '2d6dc6842464f107bccc68cd505a6c31'
          'f3b715e6dea49ffe40b1b18083376096'
-         '7fc6d33bb218e752302eef0a80ff0a89'
+         'fabe285ca75122bd0f2033f13869989d'
          '35fa97500243a79b2370fa4684828e69')
 
 build() {
@@ -46,7 +46,7 @@
   mv $pkgdir/lib/pkgconfig $pkgdir/usr/lib
 
   # Non-stock rules still go in /etc
-  install -D -m644 $srcdir/81-arch.rules $pkgdir/etc/udev/rules.d/81-arch.rules
+  install -D -m644 $srcdir/81-arch.rules $pkgdir/lib/udev/rules.d/81-arch.rules
 
   # install our module loading subsystem
   install -D -m755 $srcdir/load-modules.sh $pkgdir/lib/udev/load-modules.sh
@@ -92,7 +92,8 @@
 
   mknod -m 0600 ${pkgdir}/lib/udev/devices/console c 5 1 || return 1
   mknod -m 0666 ${pkgdir}/lib/udev/devices/null c 1 3 || return 1
-  mknod -m 0666 ${pkgdir}/lib/udev/devices/zero c 1 5 || return 1
+  mknod -m 0660 ${pkgdir}/lib/udev/devices/zero c 1 5 || return 1
+  mknod -m 0666 ${pkgdir}/lib/udev/devices/kmsg c 1 11 || return 1
 
   ln -snf /proc/self/fd ${pkgdir}/lib/udev/devices/fd || return 1
 

Modified: cdsymlinks.sh
===================================================================
--- cdsymlinks.sh	2009-03-17 21:00:46 UTC (rev 30240)
+++ cdsymlinks.sh	2009-03-17 21:22:31 UTC (rev 30241)
@@ -1,11 +1,15 @@
 #! /bin/sh
 # Creates cdsymlinks in /dev
 # for Archlinux by Tobias Powalowski <tpowa at archlinux.org>
-if [ -d /dev/cd ]; then
+
+# check on cd/dvd drives and if persistant rules file is used
+if [ -d /dev/cd -a ! -e /etc/udev/rules.d/75-cd-aliases-generator.rules ]; then
+	# remove existing device files
 	rm /dev/cdrom*
 	rm /dev/cdrw*
 	rm /dev/dvd*
 	rm /dev/dvdrw*
+	# start creating symlinks
 	for i in /dev/cd/cdrom-*; do
 		if [ -h $i ]; then
 		[ "$CD_NUMBER" = "" ] && ln -s $i /dev/cdrom
@@ -37,9 +41,4 @@
 		! [ "$DVDRW_NUMBER" = "" ] && DVDRW_NUMBER="$((DVDRW_NUMBER+1))" && ln -s $i /dev/dvdrw$DVDRW_NUMBER
 		fi
 	done
-else
-	rm /dev/cdrom*
-	rm /dev/cdrw*
-	rm /dev/dvd*
-	rm /dev/dvdrw*
 fi

Modified: readme-udev-arch.txt
===================================================================
--- readme-udev-arch.txt	2009-03-17 21:00:46 UTC (rev 30240)
+++ readme-udev-arch.txt	2009-03-17 21:22:31 UTC (rev 30241)
@@ -1,13 +1,13 @@
 ==========================
 Cold/Hotplugging with Udev
 ==========================
-Version 1.1.6
+Version 1.1.7
 written by Tobias Powalowski <tpowa at archlinux.org>
 
 ---------------
 * Requirements:
 ---------------
-- recommended kernel >=2.6.18 for this udev to work properly.
+- recommended kernel >=2.6.23 for this udev to work properly.
 - No more DevFS device paths!  If you have them, update /etc/fstab:
   /dev/discs/... etc. has been deprecated in favor of the old style:
     /dev/discs/disc0/part1 -> /dev/hda1
@@ -113,18 +113,8 @@
 ========================================
 
 - To enable this feature copy in /etc/udev/rules.d
-  75-cd-aliases-generator.rules.optinal
+  75-cd-aliases-generator.rules.optional 
   to 75-cd-aliases-generator.rules
-  Also disable this part in /lib/udev/rules.d/81-arch.rules by putting a # in front:
-  --- snip
-  ACTION=="add", SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", RUN+="/lib/udev/cdsymlinks.sh"
-  ACTION=="add", SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", ATTRS{type}=="5", RUN+="/lib/udev/cdsymlinks.sh"
-  ACTION=="add", SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="5", RUN+="/lib/udev/cdsymlinks.sh"
-  ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="hd[a-z]", RUN+="/lib/udev/cdsymlinks.sh"
-  ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="sr[0-9]*", RUN+="/lib/udev/cdsymlinks.sh"
-  ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="sg[0-9]*", RUN+="/lib/udev/cdsymlinks.sh"
---- snap
-
 - To get the same device name for CD/DVD symlinks each time you boot,
   a rule will be generated during bootup or by executing '/sbin/udevadm trigger'.
 - Examples: dvd, cdrom ,cdrw etc.
@@ -134,7 +124,7 @@
 Known issues:
 The symlink name is then bound to the hardware pci adress, 
 if you change your CD/DVD device, you have to check the
-/etc/udev/rules.d/70-peristent-net.rules file for correctness.
+/etc/udev/rules.d/70-peristent-cd.rules file for correctness.
 
 ======================================
 * Persistent Network names (optional):