kevinveenbirkenbach/linux-image-manager
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/linux-image-manager.git synced 2024-11-22 15:11:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Optimized variable

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach 2020-10-04 16:38:44 +02:00
parent fa7847fe51
commit c1c94217eb
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/image/base.sh
View File

@ -44,21 +44,13 @@ make_working_folder(){
error error
} }
set_root_variables(){
info "Setting root variables..." &&
root_partition_uuid=$(blkid "$root_partition_path" -s UUID -o value) &&
boot_partition_uuid=$(blkid "$boot_partition_path" -s UUID -o value) &&
root_mapper_name="arch-root-$root_partition_uuid" &&
root_mapper_path="/dev/mapper/$root_mapper_name" || error
}
decrypt_root(){ decrypt_root(){
if [ "$(blkid "$root_partition_path" -s TYPE -o value)" == "crypto_LUKS" ] if [ "$(blkid "$root_partition_path" -s TYPE -o value)" == "crypto_LUKS" ]
then then
set_root_variables && root_mapper_name="arch-root-$root_partition_uuid" &&
root_mapper_path="/dev/mapper/$root_mapper_name" &&
info "Decrypting of $root_partition_path is neccessary..." && info "Decrypting of $root_partition_path is neccessary..." &&
sudo cryptsetup -v luksOpen "$root_partition_path" "$root_mapper_name" || sudo cryptsetup -v luksOpen "$root_partition_path" "$root_mapper_name" || error
error
fi fi
} }
@ -66,6 +58,9 @@ mount_partitions(){
info "Mount boot and root partition..." && info "Mount boot and root partition..." &&
mount -v "$boot_partition_path" "$boot_mount_path" && mount -v "$boot_partition_path" "$boot_mount_path" &&
mount -v "$root_mapper_path" "$root_mount_path" && mount -v "$root_mapper_path" "$root_mount_path" &&
info "Settind uuid variables..." &&
root_partition_uuid=$(blkid "$root_partition_path" -s UUID -o value) &&
boot_partition_uuid=$(blkid "$boot_partition_path" -s UUID -o value) &&
info "The following mounts refering this setup exist:" && mount | grep "$working_folder_path" || info "The following mounts refering this setup exist:" && mount | grep "$working_folder_path" ||
error error
} }