Bug#724554: initramfs-tools: ignores $RESUME device from /etc/initramfs-tools/conf.d/resume
Package: initramfs-tools
Version: 0.114
Severity: normal
Tags: patch
Hi,
a typo in the recent changes to the resume hook made it no longer honour
the $RESUME device as specified in /etc/initramfs-tools/conf.d/resume.
Trivial patch is attached.
Let me add that the hook then auto-generates a $RESUME device using the
device UUID, which broke resume on my machine, where swap is in LVM.
I am not sure, but this breakage and the similar reports #576490 and
#568877 suggest that this is actually another, far more serious bug.
Nikolaus
-- Package-specific info:
-- initramfs sizes
-rw-r--r-- 1 root root 13M Sep 12 20:15 /boot/initrd.img-3.10-2-686-pae
-rw-r--r-- 1 root root 13M Sep 25 03:21 /boot/initrd.img-3.10-3-686-pae
-- /proc/cmdline
BOOT_IMAGE=/vmlinuz-3.10-3-686-pae root=/dev/mapper/vg0-root ro quiet
-- resume
RESUME=/dev/mapper/vg0-swap_1
-- /proc/filesystems
ext4
fuseblk
ext3
-- lsmod
Module Size Used by
cpufreq_conservative 13872 0
cpufreq_powersave 12422 0
cpufreq_userspace 12520 0
cpufreq_stats 12762 0
parport_pc 22073 0
ppdev 12620 0
lp 12805 0
parport 31317 3 lp,ppdev,parport_pc
bnep 17264 2
rfcomm 28433 0
bluetooth 148477 10 bnep,rfcomm
uinput 12961 1
ext3 128783 0
jbd 47838 1 ext3
loop 18067 0
fuse 61469 1
dm_crypt 18014 0
iTCO_wdt 12727 0
iTCO_vendor_support 12632 1 iTCO_wdt
snd_hda_codec_analog 65459 1
arc4 12487 2
mperf 12421 0
coretemp 12770 0
kvm 246104 0
pcmcia 32111 0
microcode 17809 0
evdev 17266 15
pcspkr 12560 0
psmouse 64900 0
serio_raw 12812 0
i2c_i801 16909 0
lpc_ich 16685 0
mfd_core 12537 1 lpc_ich
rng_core 12665 0
yenta_socket 22411 0
pcmcia_rsrc 17344 1 yenta_socket
pcmcia_core 18087 3 pcmcia,pcmcia_rsrc,yenta_socket
battery 12949 0
snd_hda_intel 31021 2
thinkpad_acpi 47525 0
snd_hda_codec 102848 2 snd_hda_intel,snd_hda_codec_analog
snd_hwdep 12939 1 snd_hda_codec
nvram 12932 1 thinkpad_acpi
snd_pcm 57885 2 snd_hda_codec,snd_hda_intel
snd_page_alloc 12910 2 snd_pcm,snd_hda_intel
nsc_ircc 17454 0
snd_seq 39569 0
irda 78736 1 nsc_ircc
snd_seq_device 13016 1 snd_seq
ath5k 115461 0
ac 12588 0
ath 17153 1 ath5k
tpm_tis 13040 0
tpm 17735 1 tpm_tis
snd_timer 22217 2 snd_pcm,snd_seq
crc_ccitt 12331 1 irda
i915 422963 2
tpm_bios 13244 1 tpm
mac80211 309057 1 ath5k
video 17499 1 i915
cfg80211 264217 3 ath,ath5k,mac80211
snd 42832 13 snd_hwdep,snd_timer,snd_pcm,snd_seq,snd_hda_codec,snd_hda_intel,thinkpad_acpi,snd_seq_device,snd_hda_codec_analog
drm_kms_helper 27237 1 i915
rfkill 18706 5 cfg80211,thinkpad_acpi,bluetooth
button 12824 1 i915
drm 165528 3 i915,drm_kms_helper
i2c_algo_bit 12713 1 i915
i2c_core 19505 5 drm,i915,i2c_i801,drm_kms_helper,i2c_algo_bit
processor 27839 2
soundcore 12890 1 snd
ext4 336587 3
crc16 12327 2 ext4,bluetooth
jbd2 58018 1 ext4
mbcache 12938 2 ext3,ext4
dm_mod 57696 10 dm_crypt
sg 21648 0
sr_mod 17541 0
sd_mod 35655 3
cdrom 30473 1 sr_mod
crc_t10dif 12332 1 sd_mod
ata_generic 12450 0
ahci 25000 2
ata_piix 25383 0
libahci 22632 1 ahci
libata 126225 4 ahci,libahci,ata_generic,ata_piix
scsi_mod 131001 4 sg,libata,sd_mod,sr_mod
e1000e 127845 0
ptp 13140 1 e1000e
pps_core 13040 1 ptp
thermal 13172 0
thermal_sys 22673 3 video,thermal,processor
ehci_pci 12432 0
uhci_hcd 22424 0
ehci_hcd 35820 1 ehci_pci
usbcore 110348 3 uhci_hcd,ehci_hcd,ehci_pci
usb_common 12408 1 usbcore
-- /etc/initramfs-tools/modules
-- /etc/kernel-img.conf
# Kernel image management overrides
# See kernel-img.conf(5) for details
do_symlinks = yes
do_bootloader = no
do_initrd = yes
link_in_boot = no
-- /etc/initramfs-tools/initramfs.conf
MODULES=most
BUSYBOX=y
KEYMAP=n
COMPRESS=gzip
DEVICE=
NFSROOT=auto
-- /etc/initramfs-tools/update-initramfs.conf
update_initramfs=yes
backup_initramfs=no
-- /etc/crypttab
# <target name> <source device> <key file> <options>
transcend /dev/disk/by-uuid/3337f6e6-81f7-457e-a9bc-9cb9f10061ca none luks
-- mkinitramfs hooks
/etc/initramfs-tools/hooks/:
/usr/share/initramfs-tools/hooks:
busybox
cryptgnupg
cryptkeyctl
cryptopenct
cryptopensc
cryptpassdev
cryptroot
dmsetup
fuse
keymap
klibc
kmod
lvm2
ntfs_3g
resume
thermal
udev
-- System Information:
Debian Release: jessie/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 3.10-3-686-pae (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages initramfs-tools depends on:
ii cpio 2.11+dfsg-1
ii klibc-utils 2.0.2-1
ii kmod 9-3
ii module-init-tools 9-3
ii udev 204-5
Versions of packages initramfs-tools recommends:
ii busybox 1:1.20.0-9
Versions of packages initramfs-tools suggests:
ii bash-completion 1:2.0-1
-- no debconf information
>From 01cd6b6898da2b12e5f23c0407e595cf06df7ca1 Mon Sep 17 00:00:00 2001
From: Nikolaus Schulz <mail@microschulz.de>
Date: Wed, 25 Sep 2013 03:23:55 +0200
Subject: [PATCH] hooks/resume: fix validation of $RESUME in
/etc/initramfs-tools/conf.d/resume
Due to a typo the device specified in $RESUME was always considered
invalid and thus auto-detected, thereby overriding any configuration by
the sysadmin.
Signed-off-by: Nikolaus Schulz <mail@microschulz.de>
---
hooks/resume | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hooks/resume b/hooks/resume
index 8554fb2..96e2ffd 100755
--- a/hooks/resume
+++ b/hooks/resume
@@ -19,7 +19,7 @@ esac
test -r /etc/initramfs-tools/conf.d/resume \
&& . /etc/initramfs-tools/conf.d/resume
if [ -n "$RESUME" ] && command -v blkid >/dev/null 2>&1 \
- && blikd -p -n swap $RESUME >/dev/null 2>&1; then
+ && blkid -p -n swap $RESUME >/dev/null 2>&1; then
# As mkinitramfs copies the config file nothing to do.
exit 0
fi
--
1.8.4.rc3
Reply to: