~mkukri/ubuntu/+source/cryptsetup:merge

Branch merges

Propose for merging

Merged into ubuntu/+source/cryptsetup:debian/sid at revision 5092a322e94ccbf5a2e97f9d42070bda8dec8d1c

Lukas Märdian (community): Approve on 2024-01-09

Simon Quigley: Pending requested 2024-01-04

Diff: 2709 lines (+2061/-27)

14 files modified

debian/changelog (+1931/-0)
debian/control (+7/-5)
debian/functions (+9/-1)
debian/initramfs/cryptroot-unlock (+12/-6)
debian/initramfs/hooks/cryptroot (+5/-3)
debian/rules (+3/-0)
debian/tests/control (+3/-2)
debian/tests/cryptroot-lvm.d/mock (+7/-2)
debian/tests/cryptroot-nested.d/config (+7/-0)
debian/tests/cryptroot-sysvinit.d/config (+7/-2)
debian/tests/initramfs-hook (+16/-2)
debian/tests/utils/cryptroot-common (+27/-3)
debian/tests/utils/mkinitramfs (+2/-0)
debian/tests/utils/mock.pm (+25/-1)

api

Superseded for merging into ubuntu/+source/cryptsetup:ubuntu/devel

Simon Quigley (community): Needs Fixing on 2024-01-03

Diff: 119 lines (+55/-9) (has conflicts)

5 files modified

debian/changelog (+47/-0)
debian/initramfs/hooks/cryptroot (+2/-2)
debian/tests/cryptroot-legacy.d/mock (+1/-1)
debian/tests/utils/init (+1/-1)
debian/tests/utils/mkinitramfs (+4/-5)

api

Merged into ubuntu/+source/cryptsetup:debian/sid at revision c3bbd696bd5cc6f54d69f76fccf275923b505ebc

Simon Quigley (community): Approve on 2023-11-20

Diff: 2671 lines (+2030/-27)

14 files modified

debian/changelog (+1900/-0)
debian/control (+7/-5)
debian/functions (+9/-1)
debian/initramfs/cryptroot-unlock (+12/-6)
debian/initramfs/hooks/cryptroot (+5/-3)
debian/rules (+3/-0)
debian/tests/control (+3/-2)
debian/tests/cryptroot-lvm.d/mock (+7/-2)
debian/tests/cryptroot-nested.d/config (+7/-0)
debian/tests/cryptroot-sysvinit.d/config (+7/-2)
debian/tests/initramfs-hook (+16/-2)
debian/tests/utils/cryptroot-common (+27/-3)
debian/tests/utils/mkinitramfs (+2/-0)
debian/tests/utils/mock.pm (+25/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

5092a32... by Mate Kukri on 2024-01-03

changelog

8728b71... by Mate Kukri on 2024-01-03

update-maintainer

4b610e5... by Mate Kukri on 2024-01-03

reconstruct-changelog

3ee1d3e... by Mate Kukri on 2024-01-03

merge-changelogs

10022f1... by Mate Kukri on 2023-11-20

  * Support zstd compressed modules for the self test.

f871147... by Mate Kukri on 2023-11-20

  * Compile-in support for a FIPS mode. LP: #2032659

2824619... by Vladimir Petko on 2023-05-14

Fix cryptroot-unlock for busybox compatibility.

45003f4... by Vladimir Petko on 2023-05-14

Fix warning and error when running on ZFS on root
      - d/functions: Return an empty devno for ZFS devices as they don't have
        major:minor device numbers.
      - d/initramfs/hooks/cryptroot: Ignore and don't print an error message
        when devices don't have a devno.

c537f63... by Vladimir Petko on 2023-05-14

debian/control:
      + Recommend plymouth.
      + Depend on busybox-initramfs instead of busybox | busybox-static.
      + Move cryptsetup-initramfs back to cryptsetup's Recommends.
      + Do not build cryptsetup-suspend binary package on i386.

12d5635... by Vladimir Petko on 2023-05-14

    - Fix cryptroot-* autopkgtests on Ubuntu. (LP: #1983522)
      + debian/tests/utils/mock.pm: return from consume() function if select()
        times out or fails
      + debian/tests/utils/cryptroot-common: fix apt source and kernel package
        names for Ubuntu
      + debian/tests/cryptroot-sysvinit.d: use systemd-sysv init for Ubuntu
        cryptroot-sysvinit package test
      + debian/tests/cryptroot-nested.d: fix cryptsetup-nested test, add
        workaround for LP1831747 by adding a e2fsprogs dependency
      + debian/tests/initramfs-hook: fix test's initramfs layout for Ubuntu and
        allow blowfish test use 64Mb of provisioned space (drop --size)
      + debian/tests/control: disable cryptdisks test