Your message dated Mon, 03 Jun 2024 12:34:09 +0000
with message-id <[email protected]>
and subject line Bug#1059501: fixed in dracut 102-1
has caused the Debian Bug report #1059501,
regarding /usr/lib/dracut/modules.d/95resume/module-setup.sh: broken, doesn't
install actual systemd-hibernate-resume.service file
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
1059501: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1059501
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: dracut-core
Version: 060+5-1
Severity: important
File: /usr/lib/dracut/modules.d/95resume/module-setup.sh
Tags: patch
Dear Maintainer,
I have the resume module included:
$ lsinitrd | grep hiber
-rwxr-xr-x 1 root root 27120 Dec 4 17:56
usr/lib/systemd/systemd-hibernate-resume
-rwxr-xr-x 1 root root 27152 Dec 4 17:56
usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
$ lsinitrd | grep resume
Arguments: -f -a 'resume'
resume
-rw-r--r-- 1 root root 30 Dec 26 23:30
etc/cmdline.d/95resume.conf
-rwxr-xr-x 1 root root 27120 Dec 4 17:56
usr/lib/systemd/systemd-hibernate-resume
-rwxr-xr-x 1 root root 27152 Dec 4 17:56
usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
And it's detected:
$ journalctl -b | grep resum
2023-12-27T00:14:10+01:00 rozbian kernel: Command line:
initrd=\klapki\a2b398a10f5f4af99258999e14093599\6.5.0-5-amd64\initrd.img-6.5.0-5-amd64
root=zfs:AUTO resume=PARTLABEL=rozbian-swap quiet iommu=on
2023-12-27T00:14:10+01:00 rozbian kernel: Kernel command line:
initrd=\klapki\a2b398a10f5f4af99258999e14093599\6.5.0-5-amd64\initrd.img-6.5.0-5-amd64
root=zfs:AUTO resume=PARTLABEL=rozbian-swap quiet iommu=on
2023-12-27T00:14:10+01:00 rozbian systemd-hibernate-resume-generator[230]:
Reported hibernation image: ID=debian kernel=6.5.0-5-amd64
UUID=5f15dfd6-d0d1-4056-841f-c19b84841f4c offset=0
2023-12-27T00:14:10+01:00 rozbian dracut-cmdline[295]: Using kernel command
line parameters: resume=LABEL=tymekodebian-sw
initrd=\klapki\a2b398a10f5f4af99258999e14093599\6.5.0-5-amd64\initrd.img-6.5.0-5-amd64
root=zfs:AUTO resume=PARTLABEL=rozbian-swap quiet iommu=on
2023-12-26T23:22:48+01:00 rozbian kernel: [drm] PSP is resuming...
2023-12-26T23:22:48+01:00 rozbian kernel: amdgpu 0000:09:00.0: amdgpu: SMU is
resuming...
2023-12-26T23:22:48+01:00 rozbian kernel: amdgpu 0000:09:00.0: amdgpu: SMU is
resumed successfully!
But resumption simply doesn't work
(/sus/power/resume is 0:0, and it's not attempted at all).
Having investigated this manually by breaking in the initrd,
I've come to the astounding conclusion that the service isn't there.
Well you can see this above, and indeed ls -lR / | grep resum shows the
symlink generated by s-h-r-g and the metadata directory, but no actual
service. So it doesn't work. It definitedly used to so this is a
regression.
Indeed, module-setup.sh shows:
43 # if systemd is included and has the hibernate-resume tool, use it
and nothing else
44 if dracut_module_included "systemd" && [[ -x
$dracutsysrootdir$systemdutildir/systemd-hibernate-resume ]]; then
45 inst_multiple -o \
46
"$systemdutildir"/system-generators/systemd-hibernate-resume-generator \
47 "$systemdsystemunitdir"/[email protected] \
48 "$systemdutildir"/systemd-hibernate-resume
49 return 0
50 fi
and conversely:
$ dpkg -S systemd-hibernate-resume
systemd: /usr/lib/systemd/systemd-hibernate-resume
systemd: /usr/share/man/man8/systemd-hibernate-resume-generator.8.gz
systemd: /usr/lib/systemd/system/systemd-hibernate-resume.service
systemd: /usr/share/man/man8/systemd-hibernate-resume.service.8.gz
systemd: /usr/share/man/man8/systemd-hibernate-resume.8.gz
systemd: /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
so the setup is just broken.
Maybe it used to work. Hell, it definitely worked because on bookworm I see:
$ curl -s https://packages.debian.org/bookworm/amd64/systemd/filelist | grep
hibern
/lib/systemd/system-generators/systemd-hibernate-resume-generator
/lib/systemd/system/hibernate.target
/lib/systemd/system/suspend-then-hibernate.target
/lib/systemd/system/[email protected]
/lib/systemd/system/systemd-hibernate.service
/lib/systemd/system/systemd-suspend-then-hibernate.service
/lib/systemd/systemd-hibernate-resume
/usr/share/man/man8/systemd-hibernate-resume-generator.8.gz
/usr/share/man/man8/systemd-hibernate-resume.8.gz
/usr/share/man/man8/[email protected]
/usr/share/man/man8/systemd-hibernate.service.8.gz
/usr/share/man/man8/systemd-suspend-then-hibernate.service.8.gz
So you just need to update this for sid systemd.
Applying the following diff:
-- >8 --
--- module-setup.sh.orig 2023-12-26 23:36:05.265998274 +0100
+++ module-setup.sh 2023-12-26 23:41:01.555605530 +0100
@@ -45,6 +45,7 @@
inst_multiple -o \
"$systemdutildir"/system-generators/systemd-hibernate-resume-generator \
"$systemdsystemunitdir"/[email protected] \
+ "$systemdsystemunitdir"/systemd-hibernate-resume.service \
"$systemdutildir"/systemd-hibernate-resume
return 0
fi
-- >8 --
I see
$ lsinitrd | grep resume
Arguments: -f -a 'resume'
resume
-rw-r--r-- 1 root root 30 Dec 26 23:41
etc/cmdline.d/95resume.conf
-rwxr-xr-x 1 root root 27120 Dec 4 17:56
usr/lib/systemd/systemd-hibernate-resume
-rwxr-xr-x 1 root root 27152 Dec 4 17:56
usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
-rw-r--r-- 1 root root 666 Dec 4 17:56
usr/lib/systemd/system/systemd-hibernate-resume.service
Rebooting to test this. If it doesn't work I'll send a followup.
-- System Information:
Debian Release: trixie/sid
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 6.5.0-5-amd64 (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE,
TAINT_UNSIGNED_MODULE
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8),
LANGUAGE=en_GB:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Versions of packages dracut-core depends on:
ii cpio 2.13+dfsg-7.1
ii dracut-core-kpartx [kpartx] 1.0
ii e2fsprogs 1.47.0-2+b1
ii kmod 30+20230601-2
ii libc6 2.37-13
ii libkmod2 30+20230601-2
ii udev 255~rc4-2
Versions of packages dracut-core recommends:
ii binutils 2.41.50.20231202-1
ii console-setup 1.223
pn cryptsetup <none>
pn dmraid <none>
ii dmsetup 2:1.02.185-2
ii lvm2 2.03.16-2
pn mdadm <none>
ii pigz 2.8-1
ii pkg-config 1.8.1-1
ii pkgconf [pkg-config] 1.8.1-1
ii systemd 255~rc4-2
dracut-core suggests no packages.
-- no debconf information
--- End Message ---
--- Begin Message ---
Source: dracut
Source-Version: 102-1
Done: Thomas Lange <[email protected]>
We believe that the bug you reported is fixed in the latest version of
dracut, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Thomas Lange <[email protected]> (supplier of updated dracut package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Mon, 03 Jun 2024 14:14:11 +0200
Source: dracut
Architecture: source
Version: 102-1
Distribution: unstable
Urgency: low
Maintainer: Thomas Lange <[email protected]>
Changed-By: Thomas Lange <[email protected]>
Closes: 753752 1022129 1029324 1033158 1041614 1059501 1068250 1071182 1071592
1072174
Changes:
dracut (102-1) unstable; urgency=low
.
* new upstream:
Closes: 1029324, 1041614, 1022129, 1071592, 1072174, 1068250
Closes: 1071182, 1059501
* change to new dracut-ng upstream repository, the package name remains
unchanged
* apply salsa MR #11, Closes: 753752
* move kpartx from depends to recommends, Closes: 1033158
Checksums-Sha1:
243e80c680cd0aa32ab388aed698535d0561b874 2675 dracut_102-1.dsc
8dd0a35897b9ccc409bc87d03f23962b397722b0 404872 dracut_102.orig.tar.xz
6dc7d7a7ee6de1ec53eddf027d75dee08764889a 16560 dracut_102-1.debian.tar.xz
e0829285e0b086e9867ee76f0f239f1951af9152 9784 dracut_102-1_amd64.buildinfo
Checksums-Sha256:
2e1f23e97c233cbd7748b5ac2bf675064b46d8529dcd38f0298c3598910b7e5d 2675
dracut_102-1.dsc
ee392497f92452a4141d23e5fa23d2594ea63c4126a4b57cc78b5a297a1ba7c9 404872
dracut_102.orig.tar.xz
3f1a6aa8b4b26361d31b857c1ce6aef9b1153291a149218aeb9183761cee9b64 16560
dracut_102-1.debian.tar.xz
bc0a191b5722bf23599447ff69a354e19f4045ca3ac24a69634592ea15fb595c 9784
dracut_102-1_amd64.buildinfo
Files:
d4381750201c692cba6d28f3d405e3b9 2675 utils optional dracut_102-1.dsc
ea0b3b3cda1f12410f0ac4de0c39e38b 404872 utils optional dracut_102.orig.tar.xz
6c56e5295e59486e5cf9fea837334614 16560 utils optional
dracut_102-1.debian.tar.xz
3c6272c7a7a94dac2074d1fc6dc65590 9784 utils optional
dracut_102-1_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQJFBAEBCAAvFiEEsR7jJz9rLetSjJPaK/jZ/gdLzeQFAmZdtBwRHGxhbmdlQGRl
Ymlhbi5vcmcACgkQK/jZ/gdLzeQAtQ//ZbwAgHrc0BMHId63qA6PB6zXm7pezs8e
Z3CIfZJGsi0uSp5ABjjnCb+2rX/FAIjFcO7f23QE03rIwwpVihm3EKGVeGCh7eEV
9O2wO4RD7Ccd/NFXWVm/TThtAUtYAeeiJKCKBwPATj/ybadnzJbQF74w/wY/D4wp
fayx0vW2Yw/+Rb+d1ypnRN9EmZDlhnfsRIPNMzNHJ7PUuVa9ozSxEEraqhgwyfQL
o4+SJtur5rKYOkef8eEF7uBaZjCenRlBzeDW1DvlnF24H+ADcUENNU1Pp89CixKT
JG2kipq1of8ERqVA+96DyG2bkt2PqPOHnD9TBEy9BFff00g91B5RkX0tOpG14g0P
isiRw4l5HjOtu/krbsOWueN8pNaTh/JK0e/0wlhq7TTNbA8rtZOiLO8prX1Bff9t
fos6v3qsTDE3QC83dKVdn8ok9TFQ1Ff+SeYwFqaFl46WqPfycvtccwrgU4fr2gtY
EfmuUTZOcEuUINGdqrNLextEt7zQokSy2ObWVGSqx07zXKQYUdzAVY2g2BBgHUqL
g2TKc28h1Nq7Udj0iDqKIcFp8tkaJDWob99UiRE7uOWGtEVv1EtaD+uAdOrBFijL
Ol4DRWAUzDFQ2KbWPGtQ4sp6sRh5x0U3S2fB7fsLu3pN0S9A+68SHkXU62rpTZcQ
gq1MVnUL/KA=
=Y4sj
-----END PGP SIGNATURE-----
pgpzk5Fns9VE_.pgp
Description: PGP signature
--- End Message ---
