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

replace disc_size with lsblk in autoprepare

Browse source
This commit is contained in:
Tobias Powalowski 2013-07-22 21:45:57 +02:00
parent c29a709461
commit f02e3e196e
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -605,7 +605,7 @@ freeze_xfs() {
mapdev() {
partition_flag=0
device_found=0
# check if we use hd sd or vd device
# check if we use sd or vd device
if ! [[ "$(echo ${1} | grep /dev/sd)" || "$(echo ${1} | grep /dev/vd)" ]]; then
linuxdevice=$(echo ${1} | sed -e 's#p[0-9].*$##')
else
@ -1382,7 +1382,7 @@ _luks()
PARTS="$(for i in $(findpartitions); do
! [[ "$(echo "${CRYPT_BLACKLIST}" | egrep "${i} _")" ]] && echo $i _
done)"
# break if all devices in use
# break if all devices are in use
if [[ "${PARTS}" = "" ]]; then
DIALOG --msgbox "No devices left for luks encryption." 0 0
return 1
@ -1427,9 +1427,8 @@ autoprepare() {
ROOT_PART_SET=""
CHOSEN_FS=""
# get just the disk size in 1000*1000 MB
if [[ "$(cat ${block}/$(basename ${DISC} 2>/dev/null)/size 2>/dev/null)" ]]; then
DISC_SIZE="$(($(expr $(cat ${block}/$(basename ${DISC})/queue/logical_block_size) '*' $(cat ${block}/$(basename ${DISC})/size))/1000000))"
else
DISC_SIZE="$(($(${_LSBLK} SIZE -d -b ${DISC})/1000000))"
if [[ "${DISC_SIZE}" = "" ]]; then
DIALOG --msgbox "ERROR: Setup cannot detect size of your device, please use normal installation routine for partitioning and mounting devices." 0 0
return 1
fi