r1746: * dh_installmodules autoscripts: Now that return code 3 is allocated by

    update-modules to indicate /etc/modules.conf is not automatically
    generated, we can ignore that return code since it's not a condition that
    should fail an installation. Closes: #165400

diff --git a/autoscripts/postinst-modules b/autoscripts/postinst-modules
index babf39bd09971cf120ab7229c9e2b932bdf884d4..f2342da434cedfbdcac722e87261c6074f3925a8 100644 (file)
--- a/autoscripts/postinst-modules
+++ b/autoscripts/postinst-modules
@@ -1,3 +1,3 @@
 if [ "$1" = "configure" ] && [ -x /sbin/update-modules ]; then
-       update-modules >/dev/null
+       update-modules >/dev/null || [ "$?" = 3 ]
 fi

diff --git a/autoscripts/postrm-modules b/autoscripts/postrm-modules
index f2d4cb7a3c3ce034d452f4290ae4e02f8cd8e5a5..804f63292651084d83ceeec80725da3fd8415c29 100644 (file)
--- a/autoscripts/postrm-modules
+++ b/autoscripts/postrm-modules
@@ -1,3 +1,3 @@
 if [ -x /sbin/update-modules ]; then
-       update-modules >/dev/null
+       update-modules >/dev/null || [ "$?" = 3]
 fi

diff --git a/debian/changelog b/debian/changelog
index e93b37afbf3d21fc4a1dca52cae0a9b117e1de42..3e23321b14439da858388c4a309704c60d4fa786 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 debhelper (4.2.33) UNRELEASED; urgency=low
 
   * Update Spanish translation of dh_clean man page. Closes: #303052
+  * dh_installmodules autoscripts: Now that return code 3 is allocated by
+    update-modules to indicate /etc/modules.conf is not automatically
+    generated, we can ignore that return code since it's not a condition that
+    should fail an installation. Closes: #165400
 
  -- Joey Hess <joeyh@debian.org>  Sat,  9 Apr 2005 17:27:12 -0400