diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2021-03-28 18:58:24 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2021-03-29 08:59:51 +0200 |
| commit | c702f4c8b2340e0db21698402307c91e600b3451 (patch) | |
| tree | d801a8abdc8eb8991a8af57925ed2baca2b4b631 /source/a | |
| parent | 152c2f5d42f80e854acfb0f0d01c450b98f4d10b (diff) | |
| download | current-c702f4c8b2340e0db21698402307c91e600b3451.tar.gz current-c702f4c8b2340e0db21698402307c91e600b3451.tar.xz | |
Sun Mar 28 18:58:24 UTC 202120210328185824
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.
Diffstat (limited to 'source/a')
| -rwxr-xr-x | source/a/mkinitrd/mkinitrd.SlackBuild | 2 | ||||
| -rw-r--r-- | source/a/mkinitrd/mkinitrd_command_generator.sh | 2 |
2 files changed, 2 insertions, 2 deletions
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' ') |