root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

more mmc fixes

Browse source
This commit is contained in:
Tobias Powalowski 2010-05-16 11:35:35 +02:00
parent 4e1f88083e
commit e4e44fe8fa
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
usr/share/archboot/installer/setup
View file

@ -138,6 +138,12 @@ get_media() {
fi fi
done done
fi fi
if [ "$SET_MEDIA" = "0" ]; then
# MMC devices with raw partitions
for dev in $(ls /dev/mmcblk* 2>/dev/null | egrep -v 'p'); do
check_media
done
fi
} }
#check on manual mounted source #check on manual mounted source
@ -149,6 +155,10 @@ manual_media() {
DIALOG --msgbox "Package directory /src/core-$(uname -m)/pkg is missing!" 0 0 DIALOG --msgbox "Package directory /src/core-$(uname -m)/pkg is missing!" 0 0
return 1 return 1
fi fi
if [ ! -d /src/core-any/pkg ]; then
DIALOG --msgbox "Package directory /src/core-any/pkg is missing!" 0 0
return 1
fi
} }
# destdir_mounts() # destdir_mounts()
@ -644,15 +654,21 @@ _getavaildisks()
_getavailpartitions() _getavailpartitions()
{ {
for i in $(findpartitions); do for i in $(findpartitions); do
if [ $(echo "$i" | grep '/md_d[0-9]') ]; then # mmc and raid partitions
if [ $(echo "$i" | grep '/md_d[0-9]') -o $(echo "$i" | grep 'mmcblk') ]; then
echo -n "$i : "; echo $(($(expr 512 '*' $(cat /sys/block/$(basename $i | sed -e 's#p.*##g')/$(basename $i)/size))/1000000)) MB; echo "\n" echo -n "$i : "; echo $(($(expr 512 '*' $(cat /sys/block/$(basename $i | sed -e 's#p.*##g')/$(basename $i)/size))/1000000)) MB; echo "\n"
# raid device
elif [ $(echo "$i" | grep 'md') ]; then elif [ $(echo "$i" | grep 'md') ]; then
echo -n "$i : "; echo $(($(expr 512 '*' $(cat /sys/block/$(basename $i)/size))/1000000)) MB; echo "\n" echo -n "$i : "; echo $(($(expr 512 '*' $(cat /sys/block/$(basename $i)/size))/1000000)) MB; echo "\n"
# mapper devices
elif [ $(echo "$i" | grep 'mapper') ]; then elif [ $(echo "$i" | grep 'mapper') ]; then
# crypt device
if [ "$(cryptsetup status $i 2>/dev/null)" ]; then if [ "$(cryptsetup status $i 2>/dev/null)" ]; then
echo -n "$i: "; echo $(($(expr 512 '*' $(cryptsetup status $(basename $i) | grep " size:" | sed -e 's#sectors##g' -e 's#size:##g'))/1000000)) MB; echo "\n" echo -n "$i: "; echo $(($(expr 512 '*' $(cryptsetup status $(basename $i) | grep " size:" | sed -e 's#sectors##g' -e 's#size:##g'))/1000000)) MB; echo "\n"
# dmraid device
elif [ "$(dmsetup info $i | grep 'DMRAID')" ]; then elif [ "$(dmsetup info $i | grep 'DMRAID')" ]; then
[ $(echo $i | grep 'p*[0-9]$') ] && echo -n "$i : "; echo $(($(expr 512 '*' $(dmsetup status $i | cut -f2 -d " "))/1000000)) MB; echo "\n" [ $(echo $i | grep 'p*[0-9]$') ] && echo -n "$i : "; echo $(($(expr 512 '*' $(dmsetup status $i | cut -f2 -d " "))/1000000)) MB; echo "\n"
# mapper device
else else
echo -n "$i : "; echo $(lvs -o lv_size --noheading --units m $i | sed -e 's#M##g') MB; echo "\n" echo -n "$i : "; echo $(lvs -o lv_size --noheading --units m $i | sed -e 's#M##g') MB; echo "\n"
fi fi