summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog17
-rw-r--r--scripts/local4
2 files changed, 13 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog
index 6a17083..3141edf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
initramfs-tools (0.89) unstable; urgency=low
+
+ Release "L'électeur c'est notoire N'a pas tout' sa raison"
+
+ [ Joey Hess ]
+ * mkinitramfs: Include libgcc_s.so.1 on arm since glibc always tries to load
+ it for the SJLJ exception handling on that architecture. (closes: #426395)
+ Thanks to Aurelien Jarno for ack and review.
[ maximilian attems ]
* initramfs.conf.5: Document ROOT hardcoding.
@@ -10,13 +17,11 @@ initramfs-tools (0.89) unstable; urgency=low
MODULES setting is passed. Thanks Henning Sprang <henning_sprang@gmx.de>
for report. (closes: #429144)
* hook-functions: Fix variable typo. Thanks Emanuele Rocca <ema@debian.org>.
+ * scripts/local: Revert change to use udev vol_id before fstype,
+ there are too many "wrongly" formated fs out there. fstype supports less,
+ but is more robust.
- [ Joey Hess ]
- * mkinitramfs: Include libgcc_s.so.1 on arm since glibc always tries to load
- it for the SJLJ exception handling on that architecture. (closes: #426395)
- Thanks to Aurelien Jarno for ack and review.
-
- -- maximilian attems <maks@debian.org> Thu, 21 Jun 2007 11:57:20 +0200
+ -- maximilian attems <maks@debian.org> Wed, 04 Jul 2007 00:28:34 +0200
initramfs-tools (0.88) unstable; urgency=low
diff --git a/scripts/local b/scripts/local
index 10e2f73..b06ca63 100644
--- a/scripts/local
+++ b/scripts/local
@@ -10,9 +10,9 @@ get_fstype ()
# vol_id has a more complete list of file systems
if [ -x /lib/udev/vol_id ]; then
- FSTYPE=$(/lib/udev/vol_id -t "${FS}" 2> /dev/null)
- else
eval $(fstype "${FS}" 2> /dev/null)
+ else
+ FSTYPE=$(/lib/udev/vol_id -t "${FS}" 2> /dev/null)
fi
RET=$?