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

Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: f022196fc471085d275126a5062d192e71a1de44
Proposed branch: ~xnox/+git/linux-meta-azure-fde:master
Merge into: ~mhcerri/+git/linux-meta-azure-fde:master
Diff against target: 81 lines (+42/-1)
5 files modified
debian/linux-image-azure-fde.links (+3/-0)
debian/linux-image-azure-fde.postinst (+12/-0)
debian/linux-image-azure-fde.postrm (+14/-0)
debian/linux-image-azure-fde.preinst (+11/-0)
debian/rules (+2/-1)
Reviewer Review Type Date Requested Status
Julian Andres Klode fyi Pending
Steve Langasek fyi Pending
Marcelo Cerri Pending
Review via email: mp+404047@code.launchpad.net

Commit message

divert grub stuff; install kernel.efi on first install only; and never update ESP again, since there is no resealing support at the moment.

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/linux-image-azure-fde.links b/debian/linux-image-azure-fde.links
2new file mode 100644
3index 0000000..ff4b10b
4--- /dev/null
5+++ b/debian/linux-image-azure-fde.links
6@@ -0,0 +1,3 @@
7+/bin/true /usr/sbin/update-grub
8+/bin/true /usr/sbin/grub-install
9+/bin/true /usr/lib/grub/grub-multi-install
10diff --git a/debian/linux-image-azure-fde.postinst b/debian/linux-image-azure-fde.postinst
11new file mode 100755
12index 0000000..14771ce
13--- /dev/null
14+++ b/debian/linux-image-azure-fde.postinst
15@@ -0,0 +1,12 @@
16+#!/bin/sh
17+set -e
18+
19+#DEBHELPER#
20+
21+# For now, only deploy kernel.efi on fresh install and do not update
22+# it. As there is no resealing support yet.
23+if [ "$1" = "configure" ] && [ -z "$2" ]; then
24+ cp -v /usr/lib/linux/kernel.efi-#KERNEL_ABI_VERSION#-azure /boot/efi/EFI/ubuntu/grubx64.efi
25+fi
26+
27+exit 0
28diff --git a/debian/linux-image-azure-fde.postrm b/debian/linux-image-azure-fde.postrm
29new file mode 100755
30index 0000000..892b301
31--- /dev/null
32+++ b/debian/linux-image-azure-fde.postrm
33@@ -0,0 +1,14 @@
34+#!/bin/sh
35+set -e
36+
37+#DEBHELPER#
38+
39+if [ remove = "$1" -o abort-install = "$1" -o disappear = "$1" ]; then
40+ for prog in /usr/sbin/update-grub /usr/sbin/grub-install /usr/lib/grub/grub-multi-install; do
41+ dpkg-divert --package #PACKAGE# --remove --rename --divert $prog.#PACKAGE# $prog
42+ done
43+ /usr/lib/grub/grub-multi-install || :
44+ update-grub || :
45+fi
46+
47+exit 0
48diff --git a/debian/linux-image-azure-fde.preinst b/debian/linux-image-azure-fde.preinst
49new file mode 100755
50index 0000000..428c047
51--- /dev/null
52+++ b/debian/linux-image-azure-fde.preinst
53@@ -0,0 +1,11 @@
54+#!/bin/sh
55+set -e
56+
57+#DEBHELPER#
58+
59+for prog in /usr/sbin/update-grub /usr/sbin/grub-install /usr/lib/grub/grub-multi-install; do
60+ dpkg-divert --quiet --package #PACKAGE# --add --rename --divert $prog.#PACKAGE# $prog
61+ ln -s /bin/true $prog
62+done
63+
64+exit 0
65diff --git a/debian/rules b/debian/rules
66index 73153b8..374a9ff 100755
67--- a/debian/rules
68+++ b/debian/rules
69@@ -95,10 +95,11 @@ binary-%: debian/control install-%
70
71 dh_installdirs $(t)
72 dh_installdocs $(t)
73+ dh_link $(t)
74 dh_installchangelogs $(t)
75 dh_compress $(t)
76 dh_fixperms $(t)
77- dh_installdeb $(t)
78+ dh_installdeb $(t) --define KERNEL_ABI_VERSION=$(KERNEL_ABI_VERSION)
79 dh_gencontrol $(t) -- $(gencontrol_flags)
80 dh_md5sums $(t)
81 dh_builddeb $(t)

Subscribers

People subscribed via source and target branches