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

remove isw_raid_devices from blockdevices, fix autoprepare on empty discs

Browse source
This commit is contained in:
Tobias Powalowski 2013-08-12 12:39:02 +02:00
parent 4d176b7d4a
commit fc2b4cd1cd
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -394,7 +394,9 @@ blockdevices() {
# $(${_LSBLK} TYPE ${dev} | grep dmraid # $(${_LSBLK} TYPE ${dev} | grep dmraid
#- iso9660 devices #- iso9660 devices
# "$(${_LSBLK} FSTYPE ${dev} | grep "iso9660") # "$(${_LSBLK} FSTYPE ${dev} | grep "iso9660")
if ! [[ "$(${_LSBLK} TYPE ${dev} | grep "dmraid")" || "$(${_LSBLK} FSTYPE ${dev} | grep "iso9660")" ]]; then #- fakeraid isw devices
# $(${_LSBLK} FSTYPE ${dev} | grep "isw_raid_member
if ! [[ "$(${_LSBLK} TYPE ${dev} | grep "dmraid")" || "$(${_LSBLK} FSTYPE ${dev} | grep "iso9660")" || "$(${_LSBLK} FSTYPE ${dev} | grep "isw_raid_member")" ]]; then
echo "${dev}" echo "${dev}"
[[ "${1}" ]] && echo ${1} [[ "${1}" ]] && echo ${1}
fi fi
@ -1384,6 +1386,10 @@ autoprepare() {
DISC=$(cat ${ANSWER}) DISC=$(cat ${ANSWER})
else else
DISC="${DISCS}" DISC="${DISCS}"
if [[ "${DISC}" = "" ]]; then
DIALOG --msgbox "ERROR: Setup cannot find available disk device, please use normal installation routine for partitioning and mounting devices." 0 0
return 1
fi
fi fi
DEFAULTFS="" DEFAULTFS=""
BOOT_PART_SET="" BOOT_PART_SET=""