11 files changed, 37 insertions, 25 deletions
diff --git a/source/a/logrotate/logrotate.slackware.diff b/source/a/logrotate/logrotate.slackware.diff
index 338ae19a0..f5b6e2473 100644
--- a/source/a/logrotate/logrotate.slackware.diff
+++ b/source/a/logrotate/logrotate.slackware.diff
@@ -1,6 +1,6 @@
---- ./logrotate.8.orig	2018-12-04 09:10:46.000000000 -0600
-+++ ./logrotate.8	2018-12-13 18:26:31.756882880 -0600
-@@ -608,6 +608,10 @@
+--- ./logrotate.8.orig	2020-02-28 06:10:26.000000000 -0600
++++ ./logrotate.8	2020-02-28 17:55:41.372212059 -0600
+@@ -341,6 +341,10 @@
  .IR .ucf\-dist ,
  .IR .ucf\-new ,
  .IR .ucf\-old ,
@@ -8,12 +8,12 @@
 +.IR .old
 +.IR .orig
 +.IR .bak
- .IR ~
+ .I ~
  
  .TP
---- ./logrotate.8.in.orig	2018-08-09 04:17:37.000000000 -0500
-+++ ./logrotate.8.in	2018-12-13 18:27:14.471878890 -0600
-@@ -608,6 +608,10 @@
+--- ./logrotate.8.in.orig	2019-12-04 03:17:23.000000000 -0600
++++ ./logrotate.8.in	2020-02-28 17:56:13.484213430 -0600
+@@ -341,6 +341,10 @@
  .IR .ucf\-dist ,
  .IR .ucf\-new ,
  .IR .ucf\-old ,
@@ -21,12 +21,12 @@
 +.IR .old
 +.IR .orig
 +.IR .bak
- .IR ~
+ .I ~
  
  .TP
---- ./config.c.orig	2018-10-05 10:01:21.000000000 -0500
-+++ ./config.c	2018-12-13 18:25:29.650888682 -0600
-@@ -149,6 +149,10 @@
+--- ./config.c.orig	2020-01-13 10:39:19.000000000 -0600
++++ ./config.c	2020-02-28 17:55:06.947210589 -0600
+@@ -147,6 +147,10 @@
      ".ucf-dist",
      ".ucf-new",
      ".ucf-old",
diff --git a/source/a/logrotate/logrotate.url b/source/a/logrotate/logrotate.url
index 529cb5fdd..dd8b8bfdc 100644
--- a/source/a/logrotate/logrotate.url
+++ b/source/a/logrotate/logrotate.url
@@ -1 +1 @@
-https://github.com/logrotate/logrotate/releases/download/3.15.1/logrotate-3.15.1.tar.xz
+https://github.com/logrotate/logrotate
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index 1e1ed18c0..1f7429082 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,10 @@
+Sat Feb 29 06:17:27 UTC 2020
+  Added kernel modules:
+  dm-bufio, dm-bio-prison, dm-persistent-data, dm-snapshot, dm-thin-pool.
+  Don't include dm-snapshot in module-blacklist.
+  These changes prompted by the suggestion to include dm-thin-pool.ko in the
+  installer by jr_bob_dobbs.
++--------------------------+
 Sat Feb  1 22:31:14 UTC 2020
   Compress kernel modules in parallel.
   Install packages with --terse mode.
diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh
index e37fc3b02..284c79288 100755
--- a/source/installer/build_installer.sh
+++ b/source/installer/build_installer.sh
@@ -1537,7 +1537,13 @@ for ind in $(seq 0 $((${#KERNELS[*]} -1)) ); do
          mv scsi.orig/hv_storvsc.ko scsi
          rm -rf${VERBOSE1} scsi.orig
          mkdir md
+         mv md.orig/dm-bufio.ko md
+         mv md.orig/dm-bio-prison.ko md
          mv md.orig/dm-raid.ko md
+         mv md.orig/dm-snapshot.ko md
+         mv md.orig/dm-thin-pool.ko md
+         mkdir md/persistent-data
+         mv md.orig/persistent-data/dm-persistent-data.ko md/persistent-data
          rm -rf${VERBOSE1} md.orig
        ;;
     esac
diff --git a/source/installer/module-blacklist b/source/installer/module-blacklist
index 1e74a60dc..9b866fefe 100644
--- a/source/installer/module-blacklist
+++ b/source/installer/module-blacklist
@@ -21,7 +21,6 @@ cpqarray.ko
 crc-itu-t.ko
 crc16.ko
 dc395x.ko
-dm-snapshot.ko
 dmx3191d.ko
 dtc.ko
 eata.ko
diff --git a/source/k/kernel-configs/config-generic-5.4.22 b/source/k/kernel-configs/config-generic-5.4.23
index 1099c1537..5ec55963f 100644
--- a/source/k/kernel-configs/config-generic-5.4.22
+++ b/source/k/kernel-configs/config-generic-5.4.23
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.22 Kernel Configuration
+# Linux/x86 5.4.23 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-generic-5.4.22.x64 b/source/k/kernel-configs/config-generic-5.4.23.x64
index 3a875f12b..94e679957 100644
--- a/source/k/kernel-configs/config-generic-5.4.22.x64
+++ b/source/k/kernel-configs/config-generic-5.4.23.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.22 Kernel Configuration
+# Linux/x86 5.4.23 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-generic-smp-5.4.22-smp b/source/k/kernel-configs/config-generic-smp-5.4.23-smp
index d6342898e..3c4e64af8 100644
--- a/source/k/kernel-configs/config-generic-smp-5.4.22-smp
+++ b/source/k/kernel-configs/config-generic-smp-5.4.23-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.22 Kernel Configuration
+# Linux/x86 5.4.23 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-huge-5.4.22 b/source/k/kernel-configs/config-huge-5.4.23
index 9799fa2c9..d9b32588c 100644
--- a/source/k/kernel-configs/config-huge-5.4.22
+++ b/source/k/kernel-configs/config-huge-5.4.23
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.22 Kernel Configuration
+# Linux/x86 5.4.23 Kernel Configuration
 #
 
 #
@@ -2688,14 +2688,14 @@ CONFIG_BCACHE=m
 CONFIG_BLK_DEV_DM_BUILTIN=y
 CONFIG_BLK_DEV_DM=y
 # CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=y
+CONFIG_DM_BUFIO=m
 CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING=y
 # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
 CONFIG_DM_BIO_PRISON=m
 CONFIG_DM_PERSISTENT_DATA=m
 CONFIG_DM_UNSTRIPED=m
 CONFIG_DM_CRYPT=y
-CONFIG_DM_SNAPSHOT=y
+CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_CACHE=m
 CONFIG_DM_CACHE_SMQ=m
diff --git a/source/k/kernel-configs/config-huge-5.4.22.x64 b/source/k/kernel-configs/config-huge-5.4.23.x64
index 0c0aa01f6..e47cf02e9 100644
--- a/source/k/kernel-configs/config-huge-5.4.22.x64
+++ b/source/k/kernel-configs/config-huge-5.4.23.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.22 Kernel Configuration
+# Linux/x86 5.4.23 Kernel Configuration
 #
 
 #
@@ -2739,14 +2739,14 @@ CONFIG_BCACHE=m
 CONFIG_BLK_DEV_DM_BUILTIN=y
 CONFIG_BLK_DEV_DM=y
 # CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=y
+CONFIG_DM_BUFIO=m
 CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING=y
 # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
 CONFIG_DM_BIO_PRISON=m
 CONFIG_DM_PERSISTENT_DATA=m
 CONFIG_DM_UNSTRIPED=m
 CONFIG_DM_CRYPT=y
-CONFIG_DM_SNAPSHOT=y
+CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_CACHE=m
 CONFIG_DM_CACHE_SMQ=m
diff --git a/source/k/kernel-configs/config-huge-smp-5.4.22-smp b/source/k/kernel-configs/config-huge-smp-5.4.23-smp
index 6e2df7207..ecd0e022b 100644
--- a/source/k/kernel-configs/config-huge-smp-5.4.22-smp
+++ b/source/k/kernel-configs/config-huge-smp-5.4.23-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.22 Kernel Configuration
+# Linux/x86 5.4.23 Kernel Configuration
 #
 
 #
@@ -2741,14 +2741,14 @@ CONFIG_BCACHE=m
 CONFIG_BLK_DEV_DM_BUILTIN=y
 CONFIG_BLK_DEV_DM=y
 # CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=y
+CONFIG_DM_BUFIO=m
 CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING=y
 # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
 CONFIG_DM_BIO_PRISON=m
 CONFIG_DM_PERSISTENT_DATA=m
 CONFIG_DM_UNSTRIPED=m
 CONFIG_DM_CRYPT=y
-CONFIG_DM_SNAPSHOT=y
+CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_CACHE=m
 CONFIG_DM_CACHE_SMQ=m