Changeset 7254832 in bootscripts-standard

Timestamp:

Feb 2, 2008, 9:18:23 AM (16 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

master

Children:

47edfd4

Parents:

7355219

Message:

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.

Files:

• Makefile (modified) (2 diffs)
• clfs/init.d/udev (modified) (6 diffs)

Makefile

@@ -76 +76 @@
         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
@@ -141 +142 @@
         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

clfs/init.d/udev

@@ -20 +20 @@
 . ${rc_functions}
 
-if [ -d "/lib64" ]; then
-        udev_libdir=/lib64
-else
-        udev_libdir=/lib
-fi
-
 case "$1" in
     start)
@@ -33 +27 @@
 
         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
         
@@ -54 +48 @@
 
         # 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
@@ -81 +75 @@
         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
         ;;
@@ -89 +83 @@
         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
         ;;
@@ -100 +94 @@
         ;;
 esac
-
-unset udev_libdir