diff -Nru initramfs-tools-0.136ubuntu6.4/debian/changelog initramfs-tools-0.136ubuntu6.5/debian/changelog
--- initramfs-tools-0.136ubuntu6.4/debian/changelog	2021-03-03 22:34:04.000000000 +0000
+++ initramfs-tools-0.136ubuntu6.5/debian/changelog	2021-03-18 18:48:17.000000000 +0000
@@ -1,3 +1,18 @@
+initramfs-tools (0.136ubuntu6.5) focal; urgency=medium
+
+  * scripts/local-premount/resume:
+    - Use readlink -f to correctly handle non-symlink $resume
+      (LP: #1876570)
+  * hook-functions:
+    - when MODULES=list there will be no 'kernel' dir, so don't try
+      to find anything there, as it will log an error
+      (LP: #1927779)
+  * hooks/fsck:
+    - don't check PASSNO, always include fsck
+      (LP: #1917780)
+
+ -- Dan Streetman <ddstreet@canonical.com>  Thu, 18 Mar 2021 14:48:17 -0400
+
 initramfs-tools (0.136ubuntu6.4) focal; urgency=medium
 
   * hook-functions: Search for firmware under /lib/firmware/updates
diff -Nru initramfs-tools-0.136ubuntu6.4/hook-functions initramfs-tools-0.136ubuntu6.5/hook-functions
--- initramfs-tools-0.136ubuntu6.4/hook-functions	2021-03-03 22:34:04.000000000 +0000
+++ initramfs-tools-0.136ubuntu6.5/hook-functions	2021-03-18 18:48:17.000000000 +0000
@@ -731,7 +731,9 @@
 	manual_add_modules $(
 		{
 			cat "${DESTDIR}/lib/modules/${version}/modules.builtin"
-			find "${DESTDIR}/lib/modules/${version}/kernel" -name '*.ko*'
+			if [ -d "${DESTDIR}/lib/modules/${version}/kernel" ]; then
+				find "${DESTDIR}/lib/modules/${version}/kernel" -name '*.ko*'
+			fi
 		} |
 		while read -r module; do
 			module="${module##*/}"
diff -Nru initramfs-tools-0.136ubuntu6.4/hooks/fsck initramfs-tools-0.136ubuntu6.5/hooks/fsck
--- initramfs-tools-0.136ubuntu6.4/hooks/fsck	2020-02-15 00:42:27.000000000 +0000
+++ initramfs-tools-0.136ubuntu6.5/hooks/fsck	2021-03-18 18:48:17.000000000 +0000
@@ -47,7 +47,7 @@
 	eval "$(_read_fstab_entry "$1")"
 
 	# Not found by default.
-	if [ "$1" = "$MNT_DIR" ] && [ "$MNT_PASS" != 0 ]; then
+	if [ "$1" = "$MNT_DIR" ]; then
 		# Ignore filesystem type for /, as it is not available and
 		# therefore never used at boot time
 		if [ "${MNT_DIR}" = "/" ] || [ "${MNT_TYPE}" = "auto" ]; then
diff -Nru initramfs-tools-0.136ubuntu6.4/scripts/local-premount/resume initramfs-tools-0.136ubuntu6.5/scripts/local-premount/resume
--- initramfs-tools-0.136ubuntu6.4/scripts/local-premount/resume	2020-02-18 01:19:14.000000000 +0000
+++ initramfs-tools-0.136ubuntu6.5/scripts/local-premount/resume	2021-03-18 18:48:17.000000000 +0000
@@ -32,7 +32,7 @@
 	exit 0
 fi
 
-DEV=$(readlink "$resume")
+DEV=$(readlink -f "$resume")
 DEV=/sys/class/block/${DEV##*/}/dev
 if [ -r "$DEV" ]; then
         read -r MAJMIN < "$DEV"