Changeset 99ff4fa

Timestamp:

05/23/2020 08:54:29 PM (3 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, ken/inkscape-core-mods, lazarus, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226

Children:

2b7e89b

Parents:

4da7077

Message:

Various fixes in initramfs:

• revert changes to the "copy" function from r23132
• copy mdadm if it exists
• add the PARTUUID case (patch by Alain Dumont)

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

File:

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

postlfs/filesystems/initramfs.xml

@@ -77 +77 @@
 
   if [ "$2" = "lib" ]; then
-    file=$(find /lib /usr/lib -maxdepth 1 -name $1 | head -n 1)
+    file=$(PATH=/lib:/usr/lib type -p $1)
   else
-    file=$(find /bin /usr/bin /sbin /usr/sbin -maxdepth 1 -name $1 | head -n 1)
+    file=$(type -p $1)
   fi
 
@@ -339 +339 @@
 
    case "$root" in
-      /dev/* ) device=$root ;;
-      UUID=* ) eval $root; device="/dev/disk/by-uuid/$UUID"  ;;
-      LABEL=*) eval $root; device="/dev/disk/by-label/$LABEL" ;;
-      ""     ) echo "No root device specified." ; problem    ;;
+      /dev/*    ) device=$root ;;
+      UUID=*    ) eval $root; device="/dev/disk/by-uuid/$UUID" ;;
+      PARTUUID=*) eval $root; device="/dev/disk/by-partuuid/$PARTUUID" ;;
+      LABEL=*   ) eval $root; device="/dev/disk/by-label/$LABEL" ;;
+      ""        ) echo "No root device specified." ; problem ;;
    esac