Changeset f350508

Timestamp:

06/09/2014 02:57:13 PM (10 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

b04b4154

Parents:

6dc6bf4

Message:

Improve detection and handling of udevd in mkinitramfs;
Put correct date in changelog.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@13215 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• postlfs/filesystems/initramfs.xml (modified) (6 diffs)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "08">                   <!-- Always 2 digits -->
+<!ENTITY day          "09">                   <!-- Always 2 digits -->
 <!ENTITY month        "06">                   <!-- Always 2 digits -->
 <!ENTITY year         "2014">
@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "June 8th, &year;">
+<!ENTITY releasedate  "June 9th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

introduction/welcome/changelog.xml

@@ -45 +45 @@
 -->
     <listitem>
-      <para>June 8th, 2014</para>
-      <itemizedlist>
+      <para>June 9th, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Improve detection and handling of udevd in
+          mkinitramfs.</para>
+        </listitem>
         <listitem>
           <para>[pierre] - Eudev-1.7 (Udev-extras). Fixes
           <ulink url="&blfs-ticket-root;5128">#5128</ulink>.</para>
         </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>June 8th, 2014</para>
+      <itemizedlist>
         <listitem>
           <para>[fernando] - MariaDB-10.0.11: move switch

postlfs/filesystems/initramfs.xml

@@ -95 +95 @@
 binfiles="$binfiles umount sed sleep ln rm uname"
 
-sbinfiles="udevadm modprobe blkid switch_root"
+# Systemd installs udevadm in /bin. Other udev implementations have it in /sbin
+if [ -x /bin/udevadm ] ; then binfiles="$binfiles udevadm"; fi
+
+sbinfiles="modprobe blkid switch_root"
 
 #Optional files and locations
-for f in mdadm udevd; do
+for f in mdadm udevd udevadm; do
   if [ -x /sbin/$f ] ; then sbinfiles="$sbinfiles $f"; fi
 done
@@ -132 +135 @@
 cp -a /lib/firmware $WDIR/lib
 
-# Copy the RAID configureation file if present
+# Copy the RAID configuration file if present
 if [ -f /etc/mdadm.conf ] ; then
   cp /etc/mdadm.conf $WDIR/etc
@@ -165 +168 @@
 # Add udevd libraries if not in /sbin
 if [ -x /lib/udev/udevd ] ; then
-  ldd /lib/udev/udevd | sed "s/\t//" | cut -d " " -f1 >> $unsorted
+  ldd /lib/udev/udevd | sed "s/\t//" | cut -d " " -f1 >> $unsorted
+elif [ -x /lib/systemd/systemd-udevd ] ; then
+  ldd /lib/systemd/systemd-udevd | sed "s/\t//" | cut -d " " -f1 >> $unsorted
 fi
 
@@ -209 +214 @@
 done
 
-cp -a /lib/udev $WDIR/lib
+if [ -d /lib/udev ]; then
+  cp -a /lib/udev $WDIR/lib
+fi
+if [ -d /lib/systemd ]; then
+  cp -a /lib/systemd $WDIR/lib
+fi
 
 # Install the kernel modules if requested
@@ -322 +332 @@
 # udevd location depends on version
 if [ -x /sbin/udevd ]; then
-  UDEV_PATH=/sbin
+  UDEVD=/sbin/udevd
+elif [ -x /lib/udev/udevd ]; then
+  UDEVD=/lib/udev/udevd
+elif [ -x /lib/systemd/systemd-udevd ]; then
+  UDEVD=/lib/systemd/systemd-udevd
 else
-  UDEV_PATH=/lib/udev
-fi
-
-${UDEV_PATH}/udevd --daemon --resolve-names=never
+  echo "Cannot find udevd nor systemd-udevd"
+  problem
+fi
+
+${UDEVD} --daemon --resolve-names=never
 udevadm trigger
 udevadm settle
@@ -337 +352 @@
 do_mount_root
 
-killall -w ${UDEV_PATH}/udevd
+killall -w ${UDEVD##*/}
 
 exec switch_root /.root "$init" "$@"