diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2021-04-27 19:19:28 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2021-04-28 09:00:01 +0200 |
| commit | abdca401c7c45e652987c030a41f12408b916eee (patch) | |
| tree | 76c2fc1ecf31b7ffda50faffe5d22d6f437316a2 /source/a/mkinitrd | |
| parent | e8ee1c899f7806500603c155005637b4186b32a2 (diff) | |
| download | current-abdca401c7c45e652987c030a41f12408b916eee.tar.gz | |
Tue Apr 27 19:19:28 UTC 202120210427191928
a/mkinitrd-1.4.11-x86_64-24.txz: Rebuilt.
Change mkinitrd shebang to #!/bin/bash. Thanks to mumahendras3.
Still, don't point /bin/sh at a shell other than bash.
Only include dm-snapshot if LVM is included. Thanks to j12i.
a/tcsh-6.22.04-x86_64-1.txz: Upgraded.
ap/mariadb-10.6.0-x86_64-1.txz: Upgraded.
Removed TokuDB stuff from rc.mysqld. Thanks to gsl.
This update fixes the illegal instruction regession on 32-bit with processors
that do not support SSE4.1 instructions.
Thanks to Noel and Charlie Wilder for reporting the issue upstream
and Matteo Bernardini for helping with the debugging.
And of course, thanks to the MariaDB upstream developers. :-)
Diffstat (limited to 'source/a/mkinitrd')
| -rw-r--r-- | source/a/mkinitrd/mkinitrd | 9 | ||||
| -rwxr-xr-x | source/a/mkinitrd/mkinitrd.SlackBuild | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/source/a/mkinitrd/mkinitrd b/source/a/mkinitrd/mkinitrd index 7a8d772a..3c90f06b 100644 --- a/source/a/mkinitrd/mkinitrd +++ b/source/a/mkinitrd/mkinitrd @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright 2004 Slackware Linux, Inc., Concord, CA, USA # Copyright 2004 Patrick J. Volkerding, Concord, CA, USA # Copyright 2007, 2008, 2009, 2010, 2011, 2015, 2016, 2017 Patrick J. Volkerding, Sebeka, MN, USA @@ -653,8 +653,11 @@ if [ ! -z "$CRYPT" -o ! -z "$LVM" ]; then elif ! echo ${MODULE_LIST} | grep -q dm-mod ; then MODULE_LIST="$MODULE_LIST:dm-mod" fi - if ! echo ${MODULE_LIST} | grep -q dm-snapshot ; then - MODULE_LIST="$MODULE_LIST:dm-snapshot" + # Ensure that dm-snapshot is included if LVM is used: + if [ ! -z "$LVM" ]; then + if ! echo ${MODULE_LIST} | grep -q dm-snapshot ; then + MODULE_LIST="$MODULE_LIST:dm-snapshot" + fi fi mkdir -p $SOURCE_TREE/lib/udev/rules.d echo 'KERNEL=="dm-[0-9]*", OPTIONS+="db_persist"' > \ diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild index 258146ec..232dc6ac 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:-23} +BUILD=${BUILD:-24} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then |