[Clfs-commits] commit: r20 - in /trunk/standard: Makefile clfs/init.d/udev

[svn at cross-lfs.org]

Author: jciccone
Date: Sat Feb  2 17:18:23 2008
New Revision: 20

Log:
Have the udev script match the LIBDIR reference in the Makefile. This ensures that it will always work. Also use udevadm for udevtrigger and udevsettle. The two have been symlinked to udevadm.

Modified:
    trunk/standard/Makefile
    trunk/standard/clfs/init.d/udev

Modified: trunk/standard/Makefile
==============================================================================
--- trunk/standard/Makefile (original)
+++ trunk/standard/Makefile Sat Feb  2 17:18:23 2008
@@ -75,6 +75,7 @@
 	install -m ${MODE} clfs/init.d/sysctl        ${EXTDIR}/rc.d/init.d/
 	install -m ${MODE} clfs/init.d/template      ${EXTDIR}/rc.d/init.d/
 	install -m ${MODE} clfs/init.d/udev          ${EXTDIR}/rc.d/init.d/
+	sed -i "s:@LIBDIR@:$(LIBDIR):g" ${EXTDIR}/rc.d/init.d/udev
 	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc0.d/K80network
 	ln -sf ../init.d/sysklogd    ${EXTDIR}/rc.d/rc0.d/K90sysklogd
 	ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc0.d/S60sendsignals
@@ -140,6 +141,7 @@
 	install -m ${MODE} clfs/init.d/setclock      		${EXTDIR}/rc.d/init.d/
 	install -m ${MODE} clfs/init.d/swap          		${EXTDIR}/rc.d/init.d/
 	install -m ${MODE} clfs/init.d/udev          		${EXTDIR}/rc.d/init.d/
+	sed -i "s:@LIBDIR@:$(LIBDIR):g" ${EXTDIR}/rc.d/init.d/udev
 	ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc0.d/S60sendsignals
 	ln -sf ../init.d/mountfs     ${EXTDIR}/rc.d/rc0.d/S70mountfs
 	ln -sf ../init.d/swap        ${EXTDIR}/rc.d/rc0.d/S80swap

Modified: trunk/standard/clfs/init.d/udev
==============================================================================
--- trunk/standard/clfs/init.d/udev (original)
+++ trunk/standard/clfs/init.d/udev Sat Feb  2 17:18:23 2008
@@ -19,12 +19,6 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
-if [ -d "/lib64" ]; then
-	udev_libdir=/lib64
-else
-	udev_libdir=/lib
-fi
-
 case "$1" in
     start)
 	boot_mesg "Creating /dev in tmpfs..."
@@ -32,7 +26,7 @@
 	evaluate_retval
 
 	boot_mesg "Copying static entries..."
-	cp --preserve=all --recursive --remove-destination ${udev_libdir}/udev/devices/* /dev
+	cp --preserve=all --recursive --remove-destination @LIBDIR@/udev/devices/* /dev
 	evaluate_retval
 	
 	boot_mesg "Setting Permissons on /dev/shm..."
@@ -53,10 +47,10 @@
 	mkdir -p /dev/.udev/queue
 
 	# configure all devices
-	/sbin/udevtrigger
+	/sbin/udevadm trigger
 	
 	# this replaces the old loop, exits after all devices are done
-	/sbin/udevsettle
+	/sbin/udevadm settle
 
 	echo_ok
 	;;
@@ -80,7 +74,7 @@
     reload)
 	boot_mesg "Reloading udev rules..."
 	udevcontrol reload_rules
-	cp --preserve=all --recursive --update ${udev_libdir}/udev/devices/* /dev
+	cp --preserve=all --recursive --update @LIBDIR@/udev/devices/* /dev
 	evaluate_retval
 	;;
 
@@ -88,9 +82,9 @@
 	boot_mesg "Updating all available device nodes in /dev..."
 	udevcontrol reload_rules
 	rm -rf /dev/.udev /dev/disk
-	cp --preserve=all --recursive --update ${udev_libdir}/udev/devices/* /dev
-	/sbin/udevtrigger
-	/sbin/udevsettle
+	cp --preserve=all --recursive --update @LIBDIR@/udev/devices/* /dev
+	/sbin/udevadm trigger
+	/sbin/udevadm settle
 	evaluate_retval
 	;;
 
@@ -99,5 +93,3 @@
 	exit 1
 	;;
 esac
-
-unset udev_libdir