summaryrefslogtreecommitdiff
path: root/scripts/local
diff options
context:
space:
mode:
authormaximilian attems <maks@debian.org>2007-07-04 10:15:53 +0200
committermaximilian attems <maks@debian.org>2007-07-04 10:15:53 +0200
commitee93d17783dc32d03faf99c29bdcd4fcc30abc43 (patch)
tree1fa953056bc9d8b4a0837a5041f3339ad9bd68bc /scripts/local
parent02b76d4d71a6e5c9cae1c0acaba281e3def583e0 (diff)
downloadinitramfs-tools-ee93d17783dc32d03faf99c29bdcd4fcc30abc43.tar.gz
initramfs-tools-ee93d17783dc32d03faf99c29bdcd4fcc30abc43.zip
scripts/local: make sure that fstype is always invoked
Diffstat (limited to 'scripts/local')
-rw-r--r--scripts/local8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/local b/scripts/local
index b06ca63..55d4c46 100644
--- a/scripts/local
+++ b/scripts/local
@@ -8,10 +8,10 @@ get_fstype ()
local FS FSTYPE FSSIZE RET
FS="${1}"
- # vol_id has a more complete list of file systems
- if [ -x /lib/udev/vol_id ]; then
- eval $(fstype "${FS}" 2> /dev/null)
- else
+ # vol_id has a more complete list of file systems,
+ # but fstype is more robust
+ eval $(fstype "${FS}" 2> /dev/null)
+ if [ "$FSTYPE" = "unknown" ] && [ -x /lib/udev/vol_id ]; then
FSTYPE=$(/lib/udev/vol_id -t "${FS}" 2> /dev/null)
fi
RET=$?