diff options
| author | Thomas Bächler <thomas@archlinux.org> | 2010-01-10 17:49:41 +0100 |
|---|---|---|
| committer | Thomas Bächler <thomas@archlinux.org> | 2010-01-24 15:09:47 +0100 |
| commit | fad38dc4614eaf1a4711e4d5da6e7fb6a1acd9ad (patch) | |
| tree | 1219a27cd2710924038c08c15dda98019d187801 /install | |
| parent | b9bc022fec6d46c2a56d218ad627bbac64e655d6 (diff) | |
| download | mkinitcpio-fad38dc4614eaf1a4711e4d5da6e7fb6a1acd9ad.tar.gz mkinitcpio-fad38dc4614eaf1a4711e4d5da6e7fb6a1acd9ad.tar.xz | |
Remove klibc-isms from autodetect: Use blkid for filesystem detection
Diffstat (limited to 'install')
| -rw-r--r-- | install/autodetect | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/install/autodetect b/install/autodetect index b3e6b90..0010da3 100644 --- a/install/autodetect +++ b/install/autodetect @@ -14,10 +14,7 @@ install () findfs () { for blkdev in $(find /dev -type b | grep -v -e /dev/loop -e /dev/ram -e /dev/fd); do - eval $(/usr/lib/klibc/bin/fstype 2>/dev/null < ${blkdev}) - if [ -n "${FSTYPE}" -a "${FSTYPE}" != "swap" -a "${FSTYPE}" != "unknown" -a "${FSTYPE}" != "luks" -a "${FSTYPE}" != "lvm2" ]; then - echo ${FSTYPE} - fi + (eval $(/sbin/blkid -o udev -p "${blkdev}"); [ "${ID_FS_USAGE}" = "filesystem" ] && echo $ID_FS_TYPE) done } |