Fri Sep 13 19:16:00 UTC 201920190913191600

a/mkinitrd-1.4.11-x86_64-13.txz:  Rebuilt.
  Add libargon2 and libgcc_s for cryptsetup LUKS2 support.
  Add jfs (thanks to gus3 on LQ) and xfs (thanks to klipkyle on LQ) repair
  tools to initrd if those filesystems are used.
  Support PARTUUID in mkinitrd_command_generator.sh (thanks to luvr on LQ).
  Fixes and enhancements to docs suggested on LQ.
  Thanks to Robby Workman.
a/sysvinit-2.96-x86_64-1.txz:  Upgraded.
ap/vim-8.1.2022-x86_64-1.txz:  Upgraded.
d/bison-3.4.2-x86_64-1.txz:  Upgraded.
d/ccache-3.7.4-x86_64-1.txz:  Upgraded.
d/icecream-1.3-x86_64-1.txz:  Upgraded.
d/meson-0.51.2-x86_64-2.txz:  Rebuilt.
  Fix meson configure crash. Thanks to orbea.
l/dbus-python-1.2.12-x86_64-1.txz:  Upgraded.
l/pulseaudio-13.0-x86_64-1.txz:  Upgraded.
l/python-certifi-2019.9.11-x86_64-1.txz:  Upgraded.
x/libwacom-1.0-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.1.2022-x86_64-1.txz:  Upgraded.

4 files changed, 21 insertions, 3 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")