5 files changed, 22 insertions, 4 deletions
diff --git a/source/a/mkinitrd/mkinitrd b/source/a/mkinitrd/mkinitrd
index 6f4ff3c19..7f921e3bd 100644
--- a/source/a/mkinitrd/mkinitrd
+++ b/source/a/mkinitrd/mkinitrd
@@ -53,6 +53,10 @@
 #   output filename. Thanks to SeB.
 # Modified by Patrick Volkerding <volkerdi@slackware.com> 04 Feb 2019
 #   Allow specifying more than one kernel version.
+# Modified by Robby Workman <rworkman@slackware.com> 05 September 2019
+#   to add libargon2 and libgcc_s for cryptsetup LUKS2 support; add
+#   jfs and xfs repair tools to initrd if those filesystems are used; 
+#   fixes and enhancements to docs
 
 MKINITRD_VERSION=1.4.11
 
@@ -620,6 +624,9 @@ if [ ! -z "$CRYPT" ]; then
   if [ -e /usr/sbin/cryptsetup ]; then
     mkdir -p $SOURCE_TREE/sbin
     cp /usr/sbin/cryptsetup $SOURCE_TREE/sbin/cryptsetup
+    find /lib /lib64 /usr/lib /usr/lib64 -name "libargon2*so*" 2> /dev/null | xargs -I'{}' cp -P --parents '{}' $SOURCE_TREE/
+    find /lib /lib64 /usr/lib /usr/lib64 -name "libgcc_s*so*" 2> /dev/null | xargs -I'{}' cp -P --parents '{}' $SOURCE_TREE/
+    MODULE_LIST="${MODULE_LIST}:algif_skcipher"
     if [ ! -e $SOURCE_TREE/sbin/udevadm ]; then
       cat << EOF > $SOURCE_TREE/sbin/udevadm
 #!/bin/sh
@@ -733,6 +740,13 @@ if [ ! -z "$MODULE_LIST" ]; then
       /sbin/modprobe --set-version $kver --show-depends --ignore-install $MODULE 2>/dev/null \
         | grep "^insmod " | cut -f 2 -d ' ' | while read SRCMOD; do
 
+        # If jfs or xfs filesystems are in use, add the repair tools to the initrd:
+        if [ "$(basename $SRCMOD .ko)" = "jfs" ]; then
+          cp -a /sbin/jfs_fsck $SOURCE_TREE/sbin/
+        elif [ "$(basename $SRCMOD .ko)" = "xfs" ]; then
+          cp -a /sbin/xfs_repair $SOURCE_TREE/sbin/
+        fi
+
         if ! grep -Eq " $(basename $SRCMOD .ko)(\.| |$)" $SOURCE_TREE/load_kernel_modules 2>/dev/null ; then
           LINE="$(echo "modprobe -v $(basename ${SRCMOD%%.gz} .ko)" )"
 
diff --git a/source/a/mkinitrd/mkinitrd.8 b/source/a/mkinitrd/mkinitrd.8
index 1874d8144..92bd18aa9 100644
--- a/source/a/mkinitrd/mkinitrd.8
+++ b/source/a/mkinitrd/mkinitrd.8
@@ -136,7 +136,8 @@ can be a device node path, UUID, or LABEL. See examples for \fB\-C\fR below.
 The directory to use as the source for the initrd.  (default: /boot/initrd-tree/)
 .TP
 .B \-u
-Include udev in the initrd.
+Include udev in the initrd (provided for backward compatibility, as udev is 
+always included in the initrd).
 .TP
 .B \-w
 The -w option specifies how long to wait in seconds before assuming that all the
@@ -217,6 +218,9 @@ available on the system.
 This option adds RAID support to the initrd, if a static mdadm binary is
 available on the system.
 .TP
+.B \-M
+This option add the files in /etc/modprobe.d/ and /lib/modprobe.d/ to the initrd.
+.TP
 .B \-V
 Display version information and exit.
 .SH EXAMPLES
diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild
index 8aaa9b273..550576038 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.30.1
-BUILD=${BUILD:-12}
+BUILD=${BUILD:-13}
 
 # 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 489225be5..739499f16 100644
--- a/source/a/mkinitrd/mkinitrd_command_generator.sh
+++ b/source/a/mkinitrd/mkinitrd_command_generator.sh
@@ -167,7 +167,7 @@ extended_usage() {
 get_root_device() {
   if [ -e $FSTAB ]; then
     RD=$(cat $FSTAB |tr '\t' ' ' |grep -v '^ *#' |tr -s ' ' |grep ' / ' |cut -f1 -d' ')
-    if [ "$(echo $RD | cut -f1 -d=)" = "LABEL" -o "$(echo $RD | cut -f1 -d=)" = "UUID" ]; then
+    if [ "$(echo $RD | cut -f1 -d=)" = "LABEL" -o "$(echo $RD | cut -f1 -d=)" = "UUID" -o "$(echo $RD | cut -f1 -d=)" = "PARTUUID" ]; then
       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")
diff --git a/source/a/sysvinit/sysvinit.wrong.version.in.init.c.again.diff b/source/a/sysvinit/sysvinit.wrong.version.in.init.c.again.diff
index 65dc02d09..562b11b43 100644
--- a/source/a/sysvinit/sysvinit.wrong.version.in.init.c.again.diff
+++ b/source/a/sysvinit/sysvinit.wrong.version.in.init.c.again.diff
@@ -5,7 +5,7 @@
  Version information is not placed in the top-level Makefile by default
  */
 -#define VERSION "2.94"
-+#define VERSION "2.95"
++#define VERSION "2.96"
  /*
   *		This file is part of the sysvinit suite,
   *		Copyright (C) 1991-2004 Miquel van Smoorenburg.