From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 7 Dec 2003 17:45:49 +0000 (-0500)
Subject: Fix test for /etc/mkinitrd/scripts/e2fsprogs to make sure it gets
X-Git-Tag: E2FSPROGS-1_35-WIP-0131~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=817cc0358c8d128015c80ed30171a69ff1e1d2fc;p=thirdparty%2Fe2fsprogs.git

Fix test for /etc/mkinitrd/scripts/e2fsprogs to make sure it gets
   removed.  (Addresses Debian Bug #213275)
---

diff --git a/debian/changelog b/debian/changelog
index 0c105886c..3c8a9e733 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+e2fsprogs (1.34+1.35-WIP-2003.12.07-2) unstable; urgency=low
+
+  * Fix test for /etc/mkinitrd/scripts/e2fsprogs to make sure it gets
+    removed.  (Closes: #213275)
+
+ -- Theodore Y. Ts'o <tytso@mit.edu>  Sun,  7 Dec 2003 12:35:21 -0500
+
 e2fsprogs (1.34+1.35-WIP-2003.12.07-1) unstable; urgency=medium
 
   * Added regression tests for mke2fs and dumpe2fs.
@@ -6,7 +13,7 @@ e2fsprogs (1.34+1.35-WIP-2003.12.07-1) unstable; urgency=medium
     specifier is passed to e2fsck or tune2fs.
   * Fix handling of corrupted indirect blocks in the bad block inode.
   * If the number of mounts until the next forced filesystem check is less
-    than 6, mention this to the user.  (Closes: ##157194)
+    than 6, mention this to the user.  (Closes: #157194)
   * E2fsck will try to avoid doing a forced filesystem chcek if a system
     is running on batteries according to APM or ACPI.  (Closes: #205177)
   * Fix problems in the German translation.  (Closes: #2000086)
diff --git a/debian/e2fsprogs.preinst b/debian/e2fsprogs.preinst
index 5dda01712..1c43c0f42 100644
--- a/debian/e2fsprogs.preinst
+++ b/debian/e2fsprogs.preinst
@@ -14,7 +14,7 @@ EOT
 esac
 
 # Old/erroneous conffile from early post-woody sid
-if [ -d /etc/mkinitrd/scripts/e2fsprogs ]
+if [ -f /etc/mkinitrd/scripts/e2fsprogs ]
 then
     rm -rf /etc/mkinitrd/scripts/e2fsprogs
 fi