From: Andrea R. <ar...@sy...> - 2006-07-17 13:34:06
|
Author: arighi Date: 2006-07-17 08:33:46 -0500 (Mon, 17 Jul 2006) New Revision: 3677 Modified: trunk/initrd_source/patches/udev.names_rules.patch trunk/initrd_source/skel/etc/init.d/functions Log: fix: added udev rules to automatically populate /dev with hd* and sd* files (this allows also to use --kernel option with si_prepareclient - aka si_mkbootpackage) Modified: trunk/initrd_source/patches/udev.names_rules.patch =================================================================== --- trunk/initrd_source/patches/udev.names_rules.patch 2006-07-16 15:25:28 UTC (rev 3676) +++ trunk/initrd_source/patches/udev.names_rules.patch 2006-07-17 13:33:46 UTC (rev 3677) @@ -1,6 +1,6 @@ --- udev-079.orig/debian/rules.d/20-names.rules 2006-05-21 16:10:16.000000000 +0200 +++ udev-079/debian/rules.d/20-names.rules 2006-05-21 16:10:19.000000000 +0200 -@@ -14,6 +14,14 @@ +@@ -14,6 +14,26 @@ KERNEL=="device-mapper", NAME="mapper/control" KERNEL=="dm-[0-9]*", NAME="dm/%n" @@ -12,6 +12,18 @@ +KERNEL=="loop[0-9]*", NAME="loop/%n" +KERNEL=="ram[0-9]*", NAME="rd/%n" + ++# by-id (hardware serial number) ++KERNEL=="hd*[!0-9]", IMPORT{program}="/sbin/ata_id --export $tempnode" ++KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}" ++KERNEL=="hd*[0-9]", IMPORT{parent}=="ID_*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n" ++ ++KERNEL=="sd*[!0-9]|sr*", SYSFS{ieee1394_id}=="*", ENV{ID_SERIAL}="$sysfs{ieee1394_id}", ENV{ID_BUS}="ieee1394" ++KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/sbin/usb_id -x" ++KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/sbin/scsi_id -g -x -s %p" ++KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/sbin/scsi_id -g -x -a -s %p" ++KERNEL=="dasd*[!0-9]", IMPORT{program}="/sbin/dasd_id --export $tempnode" ++KERNEL=="sd*[!0-9]|sr*|dasd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}" ++ # Input devices, group under /dev/input KERNEL=="event[0-9]*", NAME="input/%k" KERNEL=="mice", NAME="input/%k" Modified: trunk/initrd_source/skel/etc/init.d/functions =================================================================== --- trunk/initrd_source/skel/etc/init.d/functions 2006-07-16 15:25:28 UTC (rev 3676) +++ trunk/initrd_source/skel/etc/init.d/functions 2006-07-17 13:33:46 UTC (rev 3677) @@ -729,15 +729,8 @@ logmsg start_udevd /etc/init.d/udev start - #XXX We should figure out the root cause for this, at some point, - # and fix the actual problem, rather than just treating the - # symptom as we are doing here. -BEF- - # - # workaround chicken/egg bug in mdadm and raidautorun with udev - # they do the ioctl on the not yet existing device node... - #for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 ; do - # [ -e /dev/md$i ] || mknod -m 660 /dev/md$i b 9 $i - #done + # Force the start of udevd if init script failed + [ $? -ne 0 ] && udevd --daemon } # ################################################################################ |