From c702f4c8b2340e0db21698402307c91e600b3451 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sun, 28 Mar 2021 18:58:24 +0000
Subject: Sun Mar 28 18:58:24 UTC 2021

a/mkinitrd-1.4.11-x86_64-21.txz:  Rebuilt.
  mkinitrd_command_generator.sh: use blkid options to ensure that the correct
  root device is matched. Thanks to eduardr and shruggy.
d/ccache-4.2.1-x86_64-1.txz:  Upgraded.
d/re2c-2.1.1-x86_64-1.txz:  Upgraded.
l/gegl-0.4.30-x86_64-1.txz:  Upgraded.
n/epic5-2.1.4-x86_64-1.txz:  Upgraded.
n/fetchmail-6.4.18-x86_64-1.txz:  Upgraded.
n/whois-5.5.9-x86_64-1.txz:  Upgraded.
t/fig2dev-3.2.8a-x86_64-1.txz:  Upgraded.
t/xfig-3.2.8a-x86_64-1.txz:  Upgraded.
---
 source/a/mkinitrd/mkinitrd.SlackBuild           | 2 +-
 source/a/mkinitrd/mkinitrd_command_generator.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'source/a')

diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild
index 030f61625..ce801c575 100755
--- a/source/a/mkinitrd/mkinitrd.SlackBuild
+++ b/source/a/mkinitrd/mkinitrd.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=mkinitrd
 VERSION=${VERSION:-1.4.11}
 BB=1.32.1
-BUILD=${BUILD:-20}
+BUILD=${BUILD:-21}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/a/mkinitrd/mkinitrd_command_generator.sh b/source/a/mkinitrd/mkinitrd_command_generator.sh
index 88de76d15..e58d197a5 100644
--- a/source/a/mkinitrd/mkinitrd_command_generator.sh
+++ b/source/a/mkinitrd/mkinitrd_command_generator.sh
@@ -171,7 +171,7 @@ get_root_device() {
       DKEY=$(echo $RD | cut -f1 -d=)
       # The value can be LABEL=foo or LABEL='foo' or LABEL="foo"
       DVAL=$(echo $RD | cut -f2 -d= | tr -d "'\042")
-      RD=$(/sbin/blkid | grep -w $DKEY | grep -w $DVAL | cut -f1 -d:)
+      RD=$(/sbin/blkid --match-token $DKEY=$DVAL --list-one --output device)
     fi
   else
     RD=$(grep -m1 "^/dev/.*[[:blank:]]/[[:blank:]]" /proc/mounts | cut -f1 -d' ')
-- 
cgit v1.2.3