Changeset c7ee38f

Timestamp:

07/16/2023 02:04:12 AM (11 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

12.0, 12.0-rc1, 12.1, 12.1-rc1, multilib, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/update-glibc

Children:

a289860

Parents:

1053282

Message:

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

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.

Files:

• bootscripts/ChangeLog (modified) (1 diff)
• bootscripts/lfs/init.d/udev (modified) (1 diff)
• bootscripts/lfs/init.d/udev_retry (modified) (3 diffs)
• packages.ent (modified) (1 diff)

bootscripts/ChangeLog

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

bootscripts/lfs/init.d/udev

@@ -50 +50 @@
       # Now traverse /sys in order to "coldplug" devices that have
       # already been discovered
-      /sbin/udevadm trigger --action=add    --type=subsystems
-      /sbin/udevadm trigger --action=add    --type=devices
-      /sbin/udevadm trigger --action=change --type=devices
+      /bin/udevadm trigger --action=add    --type=subsystems
+      /bin/udevadm trigger --action=add    --type=devices
+      /bin/udevadm trigger --action=change --type=devices
 
       # Now wait for udevd to process the uevents we triggered
       if ! is_true "$OMIT_UDEV_SETTLE"; then
-         /sbin/udevadm settle
+         /bin/udevadm settle
       fi
 

bootscripts/lfs/init.d/udev_retry

@@ -35 +35 @@
       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
       # From Debian: "copy the rules generated before / was mounted
@@ -53 +51 @@
       while read 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
@@ -59 +57 @@
       # Now wait for udevd to process the uevents we triggered
       if ! is_true "$OMIT_UDEV_RETRY_SETTLE"; then
-         /sbin/udevadm settle
+         /bin/udevadm settle
       fi
 

packages.ent

@@ -391 +391 @@
 <!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-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz">