Import Debian version 0.133+deb10u1

initramfs-tools (0.133+deb10u1) buster; urgency=medium

  [ Ben Hutchings ]
  * [998371a] hooks/resume: Disable resume when there are no suitable swap
    devices. Thanks to Trek <trek00@inbox.ru> (Closes: #916696)
  * [d653197] hook-functions: Include all keyboard driver modules when
    MODULES=most. Thanks to Alper Nebi Yasak <alpernebiyasak@gmail.com>
  * [5681ccb] hook-functions: Include cros_ec_spi and SPI drivers when
    MODULES=most. Thanks to Alper Nebi Yasak <alpernebiyasak@gmail.com>
  * [8d62542] resume: Set plymouth status only if there is a suspend image
    (Closes: #928736)
  * [073586a] hook-functions: Fix copy_file with target of "/bin"
    (Closes: #928689)
  * [a78d9a5] unmkinitramfs: Work around lz4cat filename check.
    Thanks to Dimitri John Ledkov <xnox@ubuntu.com> (Closes: #930366)
  * [48a35de] update-initramfs(8): Update description of "-k all" option

  [ Alper Nebi Yasak ]
  * [1abb6f6] hook-functions: Include extcon-usbc-cros-ec when MODULES=most
  * [db6d4e2] hook-functions: Include extcon drivers when MODULES=dep

  [ Uwe Kleine-König ]
  * [360fb48] mkinitramfs: suppress warning when using bzip2 or lzma
    (Closes: #930754)

debian/changelog

+initramfs-tools (0.133+deb10u1) buster; urgency=medium
+
+  [ Ben Hutchings ]
+  * [998371a] hooks/resume: Disable resume when there are no suitable swap
+    devices. Thanks to Trek <trek00@inbox.ru> (Closes: #916696)
+  * [d653197] hook-functions: Include all keyboard driver modules when
+    MODULES=most. Thanks to Alper Nebi Yasak <alpernebiyasak@gmail.com>
+  * [5681ccb] hook-functions: Include cros_ec_spi and SPI drivers when
+    MODULES=most. Thanks to Alper Nebi Yasak <alpernebiyasak@gmail.com>
+  * [8d62542] resume: Set plymouth status only if there is a suspend image
+    (Closes: #928736)
+  * [073586a] hook-functions: Fix copy_file with target of "/bin"
+    (Closes: #928689)
+  * [a78d9a5] unmkinitramfs: Work around lz4cat filename check.
+    Thanks to Dimitri John Ledkov <xnox@ubuntu.com> (Closes: #930366)
+  * [48a35de] update-initramfs(8): Update description of "-k all" option
+
+  [ Alper Nebi Yasak ]
+  * [1abb6f6] hook-functions: Include extcon-usbc-cros-ec when MODULES=most
+  * [db6d4e2] hook-functions: Include extcon drivers when MODULES=dep
+
+  [ Uwe Kleine-König ]
+  * [360fb48] mkinitramfs: suppress warning when using bzip2 or lzma
+    (Closes: #930754)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Fri, 23 Aug 2019 02:16:37 +0100
+
 initramfs-tools (0.133) unstable; urgency=medium
 
   [ Ben Hutchings ]

hook-functions

@@ -124,15 +124,15 @@ copy_file() {
 
 	[ -f "${src}" ] || return 2
 
+	if [ -d "${DESTDIR}/${target}" ]; then
+		target="${target}/${src##*/}"
+	fi
+
 	# Canonicalise usr-merged target directories
 	case "${target}" in
 	/bin/* | /lib* | /sbin/*) target="/usr${target}" ;;
 	esac
 
-	if [ -d "${DESTDIR}/${target}" ]; then
-		target="${target}/${src##*/}"
-	fi
-
 	# check if already copied
 	[ -e "${DESTDIR}/${target}" ] && return 1
 
@@ -449,7 +449,7 @@ dep_add_modules()
 	fi
 
 	# sys walk some important device classes
-	for class in gpio phy regulator rtc; do
+	for class in extcon gpio phy regulator rtc; do
 		for device in "/sys/class/$class"/*; do
 			device="$(readlink -f "$device")" \
 				&& sys_walk_mod_add "$device"
@@ -538,15 +538,17 @@ auto_add_modules()
 			copy_modules_dir kernel/drivers/usb/musb
 			copy_modules_dir kernel/drivers/usb/renesas_usbhs
 			# and any extcon drivers for USB
-			modules="$modules extcon-usb-gpio"
+			modules="$modules extcon-usb-gpio extcon-usbc-cros-ec"
 			# Add the axp20x_usb_power power supply driver,
 			# required to initialize the USB host controllers
 			# on a number of armhf systems
 			modules="$modules axp20x_usb_power"
 
-			# Include all HID drivers unless we're sure they
-			# don't support keyboards.  hid-*ff covers various
-			# game controllers with force feedback.
+			# Include all keyboard drivers and all HID drivers
+			# unless we're sure they don't support keyboards.
+			# hid-*ff covers various game controllers with
+			# force feedback.
+			copy_modules_dir kernel/drivers/input/keyboard
 			copy_modules_dir kernel/drivers/hid \
 				'hid-*ff.ko' hid-a4tech.ko hid-cypress.ko \
 				hid-dr.ko hid-elecom.ko hid-gyration.ko \
@@ -560,6 +562,8 @@ auto_add_modules()
 				hid-speedlink.ko hid-tivo.ko hid-twinhan.ko \
 				hid-uclogic.ko hid-wacom.ko hid-waltop.ko \
 				hid-wiimote.ko hid-zydacron.ko
+			# needed to access keyboard on some ChromeOS devices
+			modules="$modules cros_ec_spi"
 
 			# Any of these might be needed by other drivers
 			copy_modules_dir kernel/drivers/bus
@@ -571,6 +575,7 @@ auto_add_modules()
 			copy_modules_dir kernel/drivers/phy
 			copy_modules_dir kernel/drivers/pinctrl
 			copy_modules_dir kernel/drivers/regulator
+			copy_modules_dir kernel/drivers/spi
 			copy_modules_dir kernel/drivers/usb/phy
 
 			# Needed for periodic fsck

hooks/resume

@@ -81,7 +81,10 @@ if ! ischroot && [ -r /proc/swaps ]; then
 		$ephemeral || break
 	done
 
-	if [ -n "$resume_auto" ] && ! $ephemeral; then
+	if $ephemeral; then
+		resume_auto=
+	fi
+	if [ -n "$resume_auto" ]; then
 		if [ -n "$dm_name" ]; then
 			resume_auto_canon="/dev/mapper/$dm_name"
 		elif UUID=$(blkid -s UUID -o value "$resume_auto"); then

mkinitramfs

@@ -185,8 +185,10 @@ gzip)	# If we're doing a reproducible build, use gzip -n
 	fi
 	;;
 lz4)	compress="lz4 -9 -l" ;;
-lzop)	;;
 xz)	compress="xz --check=crc32" ;;
+bzip2|lzma|lzop)
+	# no parameters needed
+	;;
 *)	echo "W: Unknown compression command ${compress}" >&2 ;;
 esac
 

scripts/local-premount/resume

@@ -26,9 +26,9 @@ if ! local_device_setup "${resume}" "suspend/resume device" false; then
 	exit 0
 fi
 
-use_plymouth=false
-if command -v plymouth >/dev/null && plymouth --ping; then
-	use_plymouth=true
+if [ "$(get_fstype "${DEV}")" = suspend ] &&
+   command -v plymouth >/dev/null &&
+   plymouth --ping; then
 	plymouth display-message --text="Resuming from hibernation"
 
 	# The above command does not wait for a framebuffer update to
@@ -44,8 +44,3 @@ if [ -n "${resume_offset?}" ]; then
 else
 	/bin/resume "${DEV}"
 fi
-
-if "$use_plymouth"; then
-	# plymouth hide-message does not work yet
-	plymouth display-message --text=""
-fi

unmkinitramfs

@@ -33,7 +33,7 @@ xcpio()
 		gzip -c -d "$archive"
 	elif xzcat -t "$archive" >/dev/null 2>&1 ; then
 		xzcat "$archive"
-	elif lz4cat -t "$archive" >/dev/null 2>&1 ; then
+	elif lz4cat -t < "$archive" >/dev/null 2>&1 ; then
 		lz4cat "$archive"
 	elif bzip2 -t "$archive" >/dev/null 2>&1 ; then
 		bzip2 -c -d "$archive"

update-initramfs.8

@@ -37,9 +37,8 @@ The use of "all" for the
 .I version
 string specifies
 .B update\-initramfs
-to execute the chosen action for all kernel versions, that are already known
-to
-.B update\-initramfs.
+to execute the chosen action for all installed kernel versions that already
+have an initramfs.
 
 .TP
 \fB\-c