On Thu, 20 Aug 2009 16:02:54 -0400
Andres Salomon <[email protected]> wrote:

[...]
> 
> Presumably, that
> "rmdir --ignore-fail-on-non-empty /etc/modprobe.d/arch/"
> in the postinst should instead be
> "rmdir /etc/modprobe.d/arch 2>/dev/null || true"
> 
> 

Oops, actually it's the preinst that has the problem.  The following patch
fixes it.



From cc5520bfa993421ea06ee9157760dfb12d3908fa Mon Sep 17 00:00:00 2001
From: Andres Salomon <[email protected]>
Date: Thu, 20 Aug 2009 16:26:24 -0400
Subject: [PATCH] module-init-tools: fix rmdir error upon upgrade

See http://bugs.debian.org/542357 for details.

Signed-off-by: Andres Salomon <[email protected]>
---
 debian/module-init-tools.preinst |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/debian/module-init-tools.preinst b/debian/module-init-tools.preinst
index 5fe9517..3fa43fd 100644
--- a/debian/module-init-tools.preinst
+++ b/debian/module-init-tools.preinst
@@ -73,7 +73,7 @@ upgrade_quirks() {
     [ -e "/etc/modprobe.d/arch/$file" ] || break
     rm_conffile /etc/modprobe.d/arch/$file
   done
-  rmdir --ignore-fail-on-non-empty /etc/modprobe.d/arch/
+  rmdir /etc/modprobe.d/arch/ 2>/dev/null || true
   if [ -L /etc/modprobe.d/arch-aliases \
       -a ! -e /etc/modprobe.d/arch-aliases ]; then
     rm /etc/modprobe.d/arch-aliases
-- 
1.6.3.3




--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to