Changeset 8253f9fc for postlfs/filesystems

Timestamp:

03/13/2012 11:33:42 PM (12 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 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:

f331c3e

Parents:

f8248d7

Message:

Updates to initramfs scripts

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

File:

• postlfs/filesystems/initramfs.xml (modified) (7 diffs)

postlfs/filesystems/initramfs.xml

@@ -95 +95 @@
 binfiles="$binfiles umount sed sleep ln rm uname"
 
-sbinfiles="udevadm udevd modprobe blkid switch_root mdadm"
+#Optional files and locations
+for f in mdadm udevd; do
+  if [ -x /sbin/$f ] ; then sbinfiles="$sbinfiles $f"; fi
+done
 
 unsorted=$(mktemp /tmp/unsorted.XXXXXXXXXX)
@@ -152 +155 @@
 done
 
+# Add udevd libraries if not in /sbin
+if [ -x /lib/udev/udevd ] ; then
+  ldd /lib/udev/udevd | sed "s/\t//" | cut -d " " -f1 >> $unsorted
+fi
+
 # Add module symlinks if appropriate
 if [ -n "$KERNEL_VERSION" ] && [ -x /bin/kmod ] ; then
@@ -161 +169 @@
 if  [ -x /sbin/lvm ] ; then
   ln -s lvm $WDIR/sbin/lvchange
-  ln -s lvm $WDIR/sbin/lvchange
-  ln -s lvm $WDIR/sbin/lvchange
+  ln -s lvm $WDIR/sbin/lvrename
+  ln -s lvm $WDIR/sbin/lvextend
   ln -s lvm $WDIR/sbin/lvcreate
   ln -s lvm $WDIR/sbin/lvdisplay
@@ -180 +188 @@
 
 # Install libraries
-sort $unsorted | uniq | while read lib ; do
-  if [ "$lib" == "linux-vdso.so.1" ] ||
-     [ "$lib" == "linux-gate.so.1" ]; then
+sort $unsorted | uniq | while read library ; do
+  if [ "$library" == "linux-vdso.so.1" ] ||
+     [ "$library" == "linux-gate.so.1" ]; then
     continue
   fi
@@ -199 +207 @@
      /lib/modules/$KERNEL_VERSION/kernel/drivers/usb/{host,storage}           \
      -type f 2> /dev/null | cpio --make-directories -p --quiet $WDIR
+
+  cp /lib/modules/$KERNEL_VERSION/modules.{builtin,order}                     \
+            $WDIR/lib/modules/$KERNEL_VERSION
 
   depmod -b $WDIR $KERNEL_VERSION
@@ -297 +308 @@
 done
 
-udevd --daemon --resolve-names=never
+# udevd location depends on version
+if [ -x /sbin/udevd ]; then
+  UDEV_PATH=/sbin
+else
+  UDEV_PATH=/lib/udev
+fi
+
+${UDEV_PATH}/udevd --daemon --resolve-names=never
 udevadm trigger
 udevadm settle
@@ -307 +325 @@
 do_mount_root
 
-killall -w /sbin/udevd
+killall -w ${UDEV_PATH}/udevd
 
 exec switch_root /.root "$init" "$@"