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

'added uuid usage on cryptdevice if uuid was selected!'

Browse source
This commit is contained in:
Tobias Powalowski 2009-04-22 13:44:20 +02:00
parent 821227559d
commit 1db91b4d90
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2064,9 +2064,15 @@ getraidarrays() {
getcryptsetup() { getcryptsetup() {
CRYPTSETUP="" CRYPTSETUP=""
if ! [ "$(cryptsetup status $(basename $PART_ROOT) | grep inactive)" ]; then if ! [ "$(cryptsetup status $(basename $PART_ROOT) | grep inactive)" ]; then
CRYPTDEVICE="$(echo $(cryptsetup status $(basename $PART_ROOT) | grep device: | sed -e 's#device:##g'))" if [ "$UUIDPARAMETER" = "yes" ]; then
CRYPTNAME="$(basename $PART_ROOT)" CRYPTDEVICE="/dev/disk/by-uuid/$(echo $(blkid -s UUID -o value $(cryptsetup status $(basename $PART_ROOT) | grep device: | sed -e 's#device:##g')))"
CRYPTSETUP="cryptdevice=$CRYPTDEVICE:$CRYPTNAME" CRYPTNAME="$(basename $PART_ROOT)"
CRYPTSETUP="cryptdevice=$CRYPTDEVICE:$CRYPTNAME"
else
CRYPTDEVICE="$(echo $(cryptsetup status $(basename $PART_ROOT) | grep device: | sed -e 's#device:##g'))"
CRYPTNAME="$(basename $PART_ROOT)"
CRYPTSETUP="cryptdevice=$CRYPTDEVICE:$CRYPTNAME"
fi
fi fi
} }