aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2016-09-16 23:49:36 +0100
committerBen Hutchings <ben@decadent.org.uk>2016-09-16 23:49:36 +0100
commit550ac5c6dc9979ab1fef22c0e730358f00ccc841 (patch)
tree58d6f42223f0262af59d7890454c6d81e3a21f38
parent45fbf5a22f582b58082422e9700ffd0dad2a9deb (diff)
downloadkernel_replicant_linux-550ac5c6dc9979ab1fef22c0e730358f00ccc841.tar.gz
kernel_replicant_linux-550ac5c6dc9979ab1fef22c0e730358f00ccc841.tar.bz2
kernel_replicant_linux-550ac5c6dc9979ab1fef22c0e730358f00ccc841.zip
linux-image: postrm: Make failure of rmdir on purge non-fatal (Closes: #836282)
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/templates/image.postrm.in2
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 9c73eb690099..76ebcfdde2b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -184,6 +184,8 @@ linux (4.7.4-1) UNRELEASED; urgency=medium
* [armhf] Enable drivers for Novena: MFD_STMPE as built-in; DRM_PANEL_SIMPLE,
MMA8452, TOUCHSCREEN_STMPE, BATTERY_SBS, BACKLIGHT_PWM, SND_SOC_IMX_ES8328
as modules (Closes: #837627, thanks to Vagrant Cascadian)
+ * linux-image: postrm: Make failure of rmdir on purge non-fatal
+ (Closes: #836282)
-- Ben Hutchings <ben@decadent.org.uk> Sat, 03 Sep 2016 18:34:31 +0100
diff --git a/debian/templates/image.postrm.in b/debian/templates/image.postrm.in
index 29e9c82505d7..4298752b333d 100755
--- a/debian/templates/image.postrm.in
+++ b/debian/templates/image.postrm.in
@@ -25,7 +25,7 @@ if [ "$1" = purge ]; then
modules.softdep modules.devname; do
eval rm -f /lib/modules/$version/$extra_file
done
- rmdir /lib/modules/$version
+ rmdir /lib/modules/$version || true
fi
exit 0