gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-19 11:49:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

bootscripts: Use /bin/udevadm instead of /sbin/udevadm

Browse Source 
We are switching from eudev to systemd-udev for SysV.  Systemd installs
udevadm into /usr/bin, and at least a part of its function can be used
as non-root user, so we'll no longer put it into /usr/sbin.
This commit is contained in:
Xi Ruoyao 2023-07-16 10:04:12 +08:00
parent 1053282e5f
commit c7ee38fb5a
No known key found for this signature in database
GPG Key ID: ACAAD20E19E710E3
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bootscripts/ChangeLog
View File

@ -1,3 +1,6 @@
2023-07-15 Xi Ruoyao <xry111@xry111.site>
* Use /bin/udevadm instead of /sbin/udevadm.
2022-09-30 Bruce Dubbs <bdubbs@linuxfromscratch.org> 2022-09-30 Bruce Dubbs <bdubbs@linuxfromscratch.org>
* Mount /dev/shm as a tmpfs. * Mount /dev/shm as a tmpfs.

8
bootscripts/lfs/init.d/udev
View File

@ -49,13 +49,13 @@ case "${1}" in
# Now traverse /sys in order to "coldplug" devices that have # Now traverse /sys in order to "coldplug" devices that have
# already been discovered # already been discovered
/sbin/udevadm trigger --action=add --type=subsystems /bin/udevadm trigger --action=add --type=subsystems
/sbin/udevadm trigger --action=add --type=devices /bin/udevadm trigger --action=add --type=devices
/sbin/udevadm trigger --action=change --type=devices /bin/udevadm trigger --action=change --type=devices
# Now wait for udevd to process the uevents we triggered # Now wait for udevd to process the uevents we triggered
if ! is_true "$OMIT_UDEV_SETTLE"; then if ! is_true "$OMIT_UDEV_SETTLE"; then
/sbin/udevadm settle /bin/udevadm settle
fi fi
# If any LVM based partitions are on the system, ensure they # If any LVM based partitions are on the system, ensure they

6
bootscripts/lfs/init.d/udev_retry
View File

@ -34,8 +34,6 @@ case "${1}" in
start) start)
log_info_msg "Retrying failed uevents, if any..." log_info_msg "Retrying failed uevents, if any..."
# As of udev-186, the --run option is no longer valid
#rundir=$(/sbin/udevadm info --run)
rundir=/run/udev rundir=/run/udev
# From Debian: "copy the rules generated before / was mounted # From Debian: "copy the rules generated before / was mounted
# read-write": # read-write":
@ -52,13 +50,13 @@ case "${1}" in
/bin/sed -e 's/#.*$//' /etc/sysconfig/udev_retry | /bin/grep -v '^$' | \ /bin/sed -e 's/#.*$//' /etc/sysconfig/udev_retry | /bin/grep -v '^$' | \
while read line ; do while read line ; do
for subsystem in $line ; do for subsystem in $line ; do
/sbin/udevadm trigger --subsystem-match=$subsystem --action=add /bin/udevadm trigger --subsystem-match=$subsystem --action=add
done done
done done
# Now wait for udevd to process the uevents we triggered # Now wait for udevd to process the uevents we triggered
if ! is_true "$OMIT_UDEV_RETRY_SETTLE"; then if ! is_true "$OMIT_UDEV_RETRY_SETTLE"; then
/sbin/udevadm settle /bin/udevadm settle
fi fi
evaluate_retval evaluate_retval

2
packages.ent
View File

@ -390,7 +390,7 @@
<!ENTITY less-fin-du "4.3 MB"> <!ENTITY less-fin-du "4.3 MB">
<!ENTITY less-fin-sbu "less than 0.1 SBU"> <!ENTITY less-fin-sbu "less than 0.1 SBU">
<!ENTITY lfs-bootscripts-version "20230101"> <!-- Scripts depend on this format --> <!ENTITY lfs-bootscripts-version "20230715"> <!-- Scripts depend on this format -->
<!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB"> <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">
<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz"> <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz">
<!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM"> <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">