diff options
| author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2014-05-11 15:02:47 +0000 |
|---|---|---|
| committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2014-05-11 15:02:47 +0000 |
| commit | f6fe5000d71afe93a210ee5e0976fac1a114c03f (patch) | |
| tree | 880bb35ad1d4c12fb02db8e957ecdf0189c5f9e9 /bootscripts | |
| parent | 799daaa7e6630218c2537cdbf63400817ac1292f (diff) | |
Update bootscripts for eudev.
Add gcc patch for upstream changes.</para>
Change explanation for using omit-frame-pointer in gcc-pass2.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10560 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'bootscripts')
| -rw-r--r-- | bootscripts/Makefile | 3 | ||||
| -rw-r--r-- | bootscripts/lfs/init.d/udev | 10 | ||||
| -rw-r--r-- | bootscripts/lfs/init.d/udev_retry | 6 |
3 files changed, 9 insertions, 10 deletions
diff --git a/bootscripts/Makefile b/bootscripts/Makefile index 63ae8150e..275761c63 100644 --- a/bootscripts/Makefile +++ b/bootscripts/Makefile @@ -28,8 +28,7 @@ create-dirs: install -d -m ${DIRMODE} ${MAN8} install -d -m ${DIRMODE} ${SBIN} ln -sfn services ${LIBDIR}/lsb - ln -sfn rc.d/init.d ${ETCDIR}/init.d-sysv - ln -sfn init.d-sysv ${ETCDIR}/init.d + ln -sfn rc.d/init.d ${ETCDIR}/init.d files: create-dirs install -m ${MODE} lfs/init.d/checkfs ${ETCDIR}/rc.d/init.d/ diff --git a/bootscripts/lfs/init.d/udev b/bootscripts/lfs/init.d/udev index c7257805c..ab56ab9e3 100644 --- a/bootscripts/lfs/init.d/udev +++ b/bootscripts/lfs/init.d/udev @@ -49,17 +49,17 @@ case "${1}" in # Start the udev daemon to continually watch for, and act on, # uevents - /lib/systemd/systemd-udevd --daemon + /sbin/udevd --daemon # Now traverse /sys in order to "coldplug" devices that have # already been discovered - /bin/udevadm trigger --action=add --type=subsystems - /bin/udevadm trigger --action=add --type=devices - /bin/udevadm trigger --action=change --type=devices + /sbin/udevadm trigger --action=add --type=subsystems + /sbin/udevadm trigger --action=add --type=devices + /sbin/udevadm trigger --action=change --type=devices # Now wait for udevd to process the uevents we triggered if ! is_true "$OMIT_UDEV_SETTLE"; then - /bin/udevadm settle + /sbin/udevadm settle fi # If any LVM based partitions are on the system, ensure they diff --git a/bootscripts/lfs/init.d/udev_retry b/bootscripts/lfs/init.d/udev_retry index 5db644a8b..c921fc451 100644 --- a/bootscripts/lfs/init.d/udev_retry +++ b/bootscripts/lfs/init.d/udev_retry @@ -35,7 +35,7 @@ case "${1}" in log_info_msg "Retrying failed uevents, if any..." # As of udev-186, the --run option is no longer valid - #rundir=$(/bin/udevadm info --run) + #rundir=$(/sbin/udevadm info --run) rundir=/run/udev # From Debian: "copy the rules generated before / was mounted # read-write": @@ -52,13 +52,13 @@ case "${1}" in /bin/sed -e 's/#.*$//' /etc/sysconfig/udev_retry | /bin/grep -v '^$' | \ while read line ; do for subsystem in $line ; do - /bin/udevadm trigger --subsystem-match=$subsystem --action=add + /sbin/udevadm trigger --subsystem-match=$subsystem --action=add done done # Now wait for udevd to process the uevents we triggered if ! is_true "$OMIT_UDEV_RETRY_SETTLE"; then - /bin/udevadm settle + /sbin/udevadm settle fi evaluate_retval |