diff options
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 7a8d772a6..3c90f06bd 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 258146ecf..232dc6ac2 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 |