summaryrefslogtreecommitdiff
path: root/scripts/live-bottom/12fstab
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-08-10 01:57:53 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:58:08 +0100
commit52dcef518bdb95605670b8dc12257057bf7a2dc0 (patch)
tree638f1c1ebb55ebcc0363eca6076bc7c379e568cf /scripts/live-bottom/12fstab
parent432f4b1dfead12040d21d15fd2f3ecc033ac5ca3 (diff)
downloadlive-boot-52dcef518bdb95605670b8dc12257057bf7a2dc0.tar.gz
live-boot-52dcef518bdb95605670b8dc12257057bf7a2dc0.zip
Adding debian version 3.0~a1-1.
Diffstat (limited to 'scripts/live-bottom/12fstab')
-rwxr-xr-xscripts/live-bottom/12fstab10
1 files changed, 1 insertions, 9 deletions
diff --git a/scripts/live-bottom/12fstab b/scripts/live-bottom/12fstab
index 31e1e72..ba4a7a3 100755
--- a/scripts/live-bottom/12fstab
+++ b/scripts/live-bottom/12fstab
@@ -66,15 +66,7 @@ then
continue
fi
- # udev (>= 146) no longer provides vol_id
- if [ -x /lib/udev/vol_id ]
- then
- # lenny
- /lib/udev/vol_id ${device%%[0-9]*} 2>/dev/null | grep -q "^ID_FS_USAGE=raid" && continue
- else
- # squeeze
- /sbin/blkid -o udev -p ${device%%[0-9]*} | grep -q "^ID_FS_USAGE=raid" && continue
- fi
+ /sbin/blkid -o udev -p ${device%%[0-9]*} | grep -q "^ID_FS_USAGE=raid" && continue
magic=$(/bin/dd if="${device}" bs=4086 skip=1 count=1 2>/dev/null | /bin/dd bs=10 count=1 2>/dev/null) || continue