Bug#935480: buster-pu: package initramfs-tools/0.133+deb10u1
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu
* Fix a regression that leads to a 30 second delay at boot if certain
types of swap device are used (#916696).
* Fix a confusing boot progress message on systems using plymouth in text
mode, which is currently the default (#928736).
* Fix a regression that prevents building an initramfs on systems using
fsprotect (#928689).
* Fix lsinitramfs and unmkinitramfs when using lz4 compression (#930366).
* Fix outdated text in the update-initramfs manual page (#930366).
* Fix warning when building an initramfs using bzip2 or lzma compression
(#930754).
* Include drivers needed for booting on some Chromebook models.
Ben.
diff -Nru initramfs-tools-0.133/debian/changelog initramfs-tools-0.133+deb10u1/debian/changelog
--- initramfs-tools-0.133/debian/changelog 2019-02-06 20:13:59.000000000 +0000
+++ initramfs-tools-0.133+deb10u1/debian/changelog 2019-08-23 02:16:37.000000000 +0100
@@ -1,3 +1,30 @@
+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 ]
diff -Nru initramfs-tools-0.133/hook-functions initramfs-tools-0.133+deb10u1/hook-functions
--- initramfs-tools-0.133/hook-functions 2019-02-06 03:48:49.000000000 +0000
+++ initramfs-tools-0.133+deb10u1/hook-functions 2019-08-23 02:11:27.000000000 +0100
@@ -124,15 +124,15 @@
[ -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 @@
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 @@
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 @@
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 @@
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
diff -Nru initramfs-tools-0.133/hooks/resume initramfs-tools-0.133+deb10u1/hooks/resume
--- initramfs-tools-0.133/hooks/resume 2019-02-06 04:40:30.000000000 +0000
+++ initramfs-tools-0.133+deb10u1/hooks/resume 2019-07-31 15:25:29.000000000 +0100
@@ -81,7 +81,10 @@
$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
diff -Nru initramfs-tools-0.133/mkinitramfs initramfs-tools-0.133+deb10u1/mkinitramfs
--- initramfs-tools-0.133/mkinitramfs 2019-02-06 03:55:08.000000000 +0000
+++ initramfs-tools-0.133+deb10u1/mkinitramfs 2019-07-31 15:25:48.000000000 +0100
@@ -185,8 +185,10 @@
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
diff -Nru initramfs-tools-0.133/scripts/local-premount/resume initramfs-tools-0.133+deb10u1/scripts/local-premount/resume
--- initramfs-tools-0.133/scripts/local-premount/resume 2019-02-06 03:48:49.000000000 +0000
+++ initramfs-tools-0.133+deb10u1/scripts/local-premount/resume 2019-07-31 15:25:51.000000000 +0100
@@ -26,9 +26,9 @@
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 @@
else
/bin/resume "${DEV}"
fi
-
-if "$use_plymouth"; then
- # plymouth hide-message does not work yet
- plymouth display-message --text=""
-fi
diff -Nru initramfs-tools-0.133/unmkinitramfs initramfs-tools-0.133+deb10u1/unmkinitramfs
--- initramfs-tools-0.133/unmkinitramfs 2019-02-06 03:55:08.000000000 +0000
+++ initramfs-tools-0.133+deb10u1/unmkinitramfs 2019-07-31 15:25:58.000000000 +0100
@@ -33,7 +33,7 @@
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"
diff -Nru initramfs-tools-0.133/update-initramfs.8 initramfs-tools-0.133+deb10u1/update-initramfs.8
--- initramfs-tools-0.133/update-initramfs.8 2019-02-06 03:48:49.000000000 +0000
+++ initramfs-tools-0.133+deb10u1/update-initramfs.8 2019-08-23 02:11:27.000000000 +0100
@@ -37,9 +37,8 @@
.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
-- System Information:
Debian Release: bullseye/sid
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'stable-updates'), (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.2.0-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8), LANGUAGE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Reply to: