manuel
/
gentoo-install
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed old use of $id in disk_create_luks

This commit is contained in:
oddlama 2020-10-03 19:10:54 +02:00
parent 1c476cef17
commit e1fc6cf9eb
No known key found for this signature in database
GPG Key ID: 88EA325D51D53908
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/functions.sh
View File

@ -250,10 +250,10 @@ disk_create_luks() {
local uuid="${DISK_ID_TO_UUID[$new_id]}" local uuid="${DISK_ID_TO_UUID[$new_id]}"
einfo "Creating luks ($new_id) on $device ($id)" einfo "Creating luks ($new_id) on $device_desc"
local keyfile local keyfile
keyfile="$(luks_getkeyfile "$new_id")" \ keyfile="$(luks_getkeyfile "$new_id")" \
|| die "Error in luks_getkeyfile for id=$id" || die "Error in luks_getkeyfile for $device_desc"
cryptsetup luksFormat \ cryptsetup luksFormat \
--type luks2 \ --type luks2 \
--uuid "$uuid" \ --uuid "$uuid" \
@ -265,7 +265,7 @@ disk_create_luks() {
--key-size 512 \ --key-size 512 \
--batch-mode \ --batch-mode \
"$device" \ "$device" \
|| die "Could not create luks on '$device' ($id)" || die "Could not create luks on $device_desc"
mkdir -p "$LUKS_HEADER_BACKUP_DIR" \ mkdir -p "$LUKS_HEADER_BACKUP_DIR" \
|| die "Could not create luks header backup dir '$LUKS_HEADER_BACKUP_DIR'" || die "Could not create luks header backup dir '$LUKS_HEADER_BACKUP_DIR'"
local header_file="$LUKS_HEADER_BACKUP_DIR/luks-header-$id-${uuid,,}.img" local header_file="$LUKS_HEADER_BACKUP_DIR/luks-header-$id-${uuid,,}.img"
@ -274,11 +274,11 @@ disk_create_luks() {
|| die "Could not remove old luks header backup file '$header_file'" || die "Could not remove old luks header backup file '$header_file'"
cryptsetup luksHeaderBackup "$device" \ cryptsetup luksHeaderBackup "$device" \
--header-backup-file "$header_file" \ --header-backup-file "$header_file" \
|| die "Could not backup luks header on '$device' ($id)" || die "Could not backup luks header on $device_desc"
cryptsetup open --type luks2 \ cryptsetup open --type luks2 \
--key-file "$keyfile" \ --key-file "$keyfile" \
"$device" "$name" \ "$device" "$name" \
|| die "Could not open luks encrypted device '$device' ($id)" || die "Could not open luks encrypted device $device_desc"
} }
disk_create_dummy() { disk_create_dummy() {