[projects/geninitrd] Use existing mechanism for installing udev apps but install regular variants, too if initrd-variants

arekm arekm at pld-linux.org
Tue Dec 18 14:43:29 CET 2018


commit 21ad0f7980ce6a0135e4a3c37a94472ed4f1320c
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Dec 18 14:43:20 2018 +0100

    Use existing mechanism for installing udev apps but install regular variants, too if initrd-variants don't exist.

 mod-udev.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/mod-udev.sh b/mod-udev.sh
index a2491ee..87f4b68 100644
--- a/mod-udev.sh
+++ b/mod-udev.sh
@@ -44,8 +44,6 @@ initrd_gen_udev() {
 	inst_d /sbin /etc/udev /lib/udev
 	inst_exec $udevd /sbin/udevd
 	inst_exec $udevadm /sbin/udevadm
-	inst_exec /lib/udev/ata_id  /lib/udev/ata_id
-	inst_exec /lib/udev/scsi_id /lib/udev/scsi_id
 	inst /etc/udev/udev.conf /etc/udev/udev.conf
 	# standard udev rules
 	inst_rules 50-udev-default.rules 60-persistent-storage.rules 61-persistent-storage-edd.rules 80-drivers.rules 95-udev-late.rules \
@@ -57,6 +55,8 @@ initrd_gen_udev() {
 	for e in ata_id cdrom_id collect firmware scsi_id v4l_id; do
 		if [ -e "$initrd_dir/udev/$e" ]; then
 			inst_exec $initrd_dir/udev/$e /lib/udev/$e
+		elif [ -e "/lib/udev/$e" ]; then
+			inst_exec /lib/udev/$e /lib/udev/$e
 		fi
 	done
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/geninitrd.git/commitdiff/21ad0f7980ce6a0135e4a3c37a94472ed4f1320c



More information about the pld-cvs-commit mailing list