From 36110bf0362050f54f7dd714648abe0df72719bc Mon Sep 17 00:00:00 2001 From: Helmut Buchsbaum Date: Wed, 4 May 2022 13:06:11 +0200 Subject: [PATCH] debian: Trigger grub-acrn on acrn-hypervisor install Tracked-On: #6688 Signed-off-by: Helmut Buchsbaum --- debian/acrn-hypervisor.postinst.in | 3 --- debian/acrn-hypervisor.postrm.in | 6 +++--- debian/acrn-hypervisor.prerm.in | 6 +++--- debian/acrn-hypervisor.triggers | 1 + debian/grub-acrn.postinst | 2 +- debian/grub-acrn.triggers | 1 + 6 files changed, 9 insertions(+), 10 deletions(-) create mode 100644 debian/acrn-hypervisor.triggers create mode 100644 debian/grub-acrn.triggers diff --git a/debian/acrn-hypervisor.postinst.in b/debian/acrn-hypervisor.postinst.in index b2048c101..6ef528e19 100644 --- a/debian/acrn-hypervisor.postinst.in +++ b/debian/acrn-hypervisor.postinst.in @@ -44,9 +44,6 @@ case "$1" in cat ${ACRNETC}/serial.conf >> /etc/serial.conf echo "# END - ACRN HYPERVISOR INSTALL" >> /etc/serial.conf fi - if command -v update-grub > /dev/null && [ -d /boot/grub ]; then - update-grub || : - fi fi ;; diff --git a/debian/acrn-hypervisor.postrm.in b/debian/acrn-hypervisor.postrm.in index 0ae0a2ab2..fa8ce7e6a 100644 --- a/debian/acrn-hypervisor.postrm.in +++ b/debian/acrn-hypervisor.postrm.in @@ -5,6 +5,8 @@ set -e +. /usr/share/debconf/confmodule + rm_acrn() { rm -f /boot/acrn-@acrnversion@.config @@ -30,9 +32,7 @@ rm_acrn() case "$1" in remove|purge) rm_acrn - if command -v update-grub > /dev/null && [ -d /boot/grub ]; then - update-grub || : - fi + db_purge acrn-hypervisor || : ;; upgrade) rm_acrn diff --git a/debian/acrn-hypervisor.prerm.in b/debian/acrn-hypervisor.prerm.in index 5ec1330d2..fdafffe08 100644 --- a/debian/acrn-hypervisor.prerm.in +++ b/debian/acrn-hypervisor.prerm.in @@ -5,6 +5,8 @@ set -e +. /usr/share/debconf/confmodule + rm_acrn() { rm -f /boot/acrn-@acrnversion@.config @@ -31,9 +33,7 @@ rm_acrn() case "$1" in deconfigure) rm_acrn - if command -v update-grub > /dev/null && [ -d /boot/grub ]; then - update-grub || : - fi + db_purge acrn-hypervisor || : ;; remove|upgrade|failed-upgrade) diff --git a/debian/acrn-hypervisor.triggers b/debian/acrn-hypervisor.triggers new file mode 100644 index 000000000..2a47b16f9 --- /dev/null +++ b/debian/acrn-hypervisor.triggers @@ -0,0 +1 @@ +activate-await grub-acrn-update diff --git a/debian/grub-acrn.postinst b/debian/grub-acrn.postinst index 5daad79ef..96943f4c2 100644 --- a/debian/grub-acrn.postinst +++ b/debian/grub-acrn.postinst @@ -6,7 +6,7 @@ set -e case "$1" in - configure) + configure|triggered) if command -v update-grub > /dev/null && [ -d /boot/grub ]; then update-grub || : fi diff --git a/debian/grub-acrn.triggers b/debian/grub-acrn.triggers new file mode 100644 index 000000000..4bfbde3e2 --- /dev/null +++ b/debian/grub-acrn.triggers @@ -0,0 +1 @@ +interest-await grub-acrn-update