diff options
author | Thomas Bächler <thomas@archlinux.org> | 2008-03-16 10:55:51 +0100 |
---|---|---|
committer | Thomas Bächler <thomas@archlinux.org> | 2008-03-16 10:55:51 +0100 |
commit | c98f860009e05b4d3f10b914ade3a5fad1df6b24 (patch) | |
tree | c4f8062d5f52cd41d94bf08c38d2fc2d95c130eb /install/autodetect | |
parent | 1f8eed5b46629c3e38207349b505251e3c0cde1c (diff) | |
download | mkinitcpio-c98f860009e05b4d3f10b914ade3a5fad1df6b24.tar.gz mkinitcpio-c98f860009e05b4d3f10b914ade3a5fad1df6b24.tar.xz |
Fix various coding style issues
Diffstat (limited to 'install/autodetect')
-rw-r--r-- | install/autodetect | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/install/autodetect b/install/autodetect index e446a07..8d7da7e 100644 --- a/install/autodetect +++ b/install/autodetect @@ -13,14 +13,14 @@ install () findfs () { for blkdev in $(find /dev -type b | grep -v -e loop -e ram -e 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 + 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 done } - if [ $UID -eq 0 -o "$(groups | grep disk)" != "" ]; then + if [ ${UID} -eq 0 -o "$(groups | grep disk)" != "" ]; then for fs in $(findfs | sort | uniq); do for mod in $(find "${MODULEDIR}" -type f -name "${fs}.ko"); do if [ -n "${mod}" ]; then @@ -44,7 +44,7 @@ install () err "User does not have proper permissions to read superblocks, raid and filesystem modules are not detected" fi - for m in $AUTODETECT; do + for m in ${AUTODETECT}; do modname="$(basename ${m%%\.ko})" grep "^${modname}$" "${MODULE_FILE}" >/dev/null 2>&1 && continue case "${m}" in |