Merge ~xnox/+git/linux-azure-fde:master into ~mhcerri/+git/linux-azure-fde:master

Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: dccbcb3d081a4aff60ad71a783103c1aadd3814d
Proposed branch: ~xnox/+git/linux-azure-fde:master
Merge into: ~mhcerri/+git/linux-azure-fde:master
Diff against target: 28 lines (+3/-1)
2 files modified
debian.azure-fde/control.stub (+1/-1)
debian/rules (+2/-0)
Reviewer Review Type Date Requested Status
Marcelo Cerri Pending
Review via email: mp+403958@code.launchpad.net

Commit message

Enable cloudimg-rootfs feature

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian.azure-fde/control.stub b/debian.azure-fde/control.stub
2index 59e6a32..af08d0a 100644
3--- a/debian.azure-fde/control.stub
4+++ b/debian.azure-fde/control.stub
5@@ -5,7 +5,7 @@ Maintainer: Canonical Kernel Team <kernel-team@lists.ubuntu.com>
6 Build-Depends:
7 dpkg (>= 1.13.19),
8 debhelper (>= 9),
9- ubuntu-core-initramfs,
10+ ubuntu-core-initramfs (>= 47),
11 lsb-release,
12 python3,
13 python3-apt,
14diff --git a/debian/rules b/debian/rules
15index 7cbfe63..de79f35 100755
16--- a/debian/rules
17+++ b/debian/rules
18@@ -68,8 +68,10 @@ override_dh_auto_build:
19 dpkg-deb -x $${pkg}_*.deb $$flavour; \
20 ); \
21 ubuntu-core-initramfs create-initrd --output "$(initrd)" \
22+ --feature main server cloudimg-rootfs \
23 --kernelver "$(abi)-$$flavour"; \
24 ubuntu-core-initramfs create-efi --unsigned --output "$(efi)" \
25+ --cmdline "snapd_recovery_mode=cloudimg-rootfs" \
26 --kernel "$(tmpdir)/$$flavour/boot/vmlinuz" \
27 --kernelver "$(abi)-$$flavour" \
28 --initrd "$(initrd)"; \

Subscribers

People subscribed via source and target branches