[linux] 02/03: linux-image: postrm: Update default symlinks before running hook scripts

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 586edb84cd5a2712695486465a920410c71eaca0
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Jun 4 22:37:09 2016 +0100

    linux-image: postrm: Update default symlinks before running hook scripts
    
    Currently the default symlinks may be broken when we run hook scripts,
    causing removal to fail if a hook (e.g. lilo) relies on them.
---
 debian/changelog                 | 1 +
 debian/templates/image.postrm.in | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 19af46f..49966b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ linux (4.6-1~exp3) UNRELEASED; urgency=medium
     linux-update-symlinks command (Closes: #692333, #815850).  Drop support
     for  minimal_swap, no_symlinks, use_hard_links and *_hook parameters in
     /etc/kernel-img.conf (Closes: #730073).
+  * linux-image: postrm: Update default symlinks before running hook scripts
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 04 Jun 2016 18:33:11 +0100
 
diff --git a/debian/templates/image.postrm.in b/debian/templates/image.postrm.in
index 1a52e7b..9ba8546 100755
--- a/debian/templates/image.postrm.in
+++ b/debian/templates/image.postrm.in
@@ -3,15 +3,15 @@
 version=@abiname@@localversion@
 image_path=/boot/@image-stem at -$version
 
+if [ "$1" != upgrade ] && command -v linux-update-symlinks >/dev/null; then
+    linux-update-symlinks remove $version $image_path
+fi
+
 if [ -d /etc/kernel/postrm.d ]; then
     DEB_MAINT_PARAMS="$*" run-parts --report --exit-on-error --arg=$version \
 	      --arg=$image_path /etc/kernel/postrm.d
 fi
 
-if [ "$1" != upgrade ] && command -v linux-update-symlinks >/dev/null; then
-    linux-update-symlinks remove $version $image_path
-fi
-
 if [ "$1" = purge ]; then
     for extra_file in modules.dep modules.isapnpmap modules.pcimap \
                       modules.usbmap modules.parportmap \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git