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

[svn at cross-lfs.org]

Author: jciccone
Date: Sun Sep 14 16:52:34 2008
New Revision: 24

Log:
Have Udev use /lib again.

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

Modified: trunk/standard/Makefile
==============================================================================
--- trunk/standard/Makefile (original)
+++ trunk/standard/Makefile Sun Sep 14 16:52:34 2008
@@ -141,7 +141,6 @@
 	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 Sun Sep 14 16:52:34 2008
@@ -26,7 +26,7 @@
 	evaluate_retval
 
 	boot_mesg "Copying static entries..."
-	cp --preserve=all --recursive --remove-destination @LIBDIR@/udev/devices/* /dev
+	cp --preserve=all --recursive --remove-destination /lib/udev/devices/* /dev
 	evaluate_retval
 	
 	boot_mesg "Setting Permissons on /dev/shm..."
@@ -74,7 +74,7 @@
     reload)
 	boot_mesg "Reloading udev rules..."
 	udevadm control reload_rules
-	cp --preserve=all --recursive --update @LIBDIR@/udev/devices/* /dev
+	cp --preserve=all --recursive --update /lib/udev/devices/* /dev
 	evaluate_retval
 	;;
 
@@ -82,7 +82,7 @@
 	boot_mesg "Updating all available device nodes in /dev..."
 	udevadm control reload_rules
 	rm -rf /dev/.udev /dev/disk
-	cp --preserve=all --recursive --update @LIBDIR@/udev/devices/* /dev
+	cp --preserve=all --recursive --update /lib/udev/devices/* /dev
 	/sbin/udevadm trigger
 	/sbin/udevadm settle
 	evaluate_retval