harald/VerityBook
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

clonedisk.sh: Don't fail if EFI boot entries already set

Browse source
This commit is contained in:
Harald Hoyer 2018-09-12 16:38:06 +02:00
parent 1138c7c1ec
commit b449e327c7
1 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
clonedisk.sh
View file

@ -133,12 +133,12 @@ if [[ ${OUT#/dev/nvme} != $OUT ]]; then
OUT="${OUT}p" OUT="${OUT}p"
fi fi
for i in 1 2; do dd if=${IN}2 of=${OUT}$2 status=progress
dd if=${IN}${i} of=${OUT}${i} status=progress sfdisk --part-uuid ${OUT_DEV} 2 $(blkid -o value -s PARTUUID ${IN}2)
sfdisk --part-uuid ${OUT_DEV} $i $(blkid -o value -s PARTUUID ${IN}${i})
done
if ! [[ $UPDATE ]]; then if ! [[ $UPDATE ]]; then
mkfs.fat -nEFI -F32 ${OUT}1
if [[ $USE_CRYPT ]]; then if [[ $USE_CRYPT ]]; then
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# swap # swap
@ -155,12 +155,23 @@ if ! [[ $UPDATE ]]; then
fi fi
fi fi
efibootmgr -C -b FED1 -d ${OUT_DEV} -p 1 -L "FedoraBook 1" -l '\efi\fedorabook\1.efi' mkdir -p boot
efibootmgr -C -b FED2 -d ${OUT_DEV} -p 1 -L "FedoraBook 2" -l '\efi\fedorabook\2.efi' mount ${OUT}1 boot
efibootmgr -C -b FED3 -d ${OUT_DEV} -p 1 -L "FedoraBook Old 1" -l '\efi\fedorabook\_1.efi' mkdir -p boot/EFI/FedoraBook
efibootmgr -C -b FED4 -d ${OUT_DEV} -p 1 -L "FedoraBook Old 2" -l '\efi\fedorabook\_2.efi' cp /efi/EFI/Boot/bootx64.efi boot/EFI/FedoraBook/1.efi
umount boot
rmdir boot
BOOT_ORDER=$(efibootmgr | grep BootOrder: | { read _ a; echo "$a"; }) if ! [[ $UPDATE ]]; then
if ! [[ $BOOT_ORDER == *FED1* ]]; then if ! [[ $(efibootmgr) == *FED1* ]]; then
efibootmgr -o "FED1,FED2,FED3,FED4,$BOOT_ORDER" efibootmgr -C -b FED1 -d ${OUT_DEV} -p 1 -L "FedoraBook 1" -l '\efi\fedorabook\1.efi'
efibootmgr -C -b FED2 -d ${OUT_DEV} -p 1 -L "FedoraBook 2" -l '\efi\fedorabook\2.efi'
efibootmgr -C -b FED3 -d ${OUT_DEV} -p 1 -L "FedoraBook Old 1" -l '\efi\fedorabook\_1.efi'
efibootmgr -C -b FED4 -d ${OUT_DEV} -p 1 -L "FedoraBook Old 2" -l '\efi\fedorabook\_2.efi'
fi
BOOT_ORDER=$(efibootmgr | grep BootOrder: | { read _ a; echo "$a"; })
if ! [[ $BOOT_ORDER == *FED1* ]]; then
efibootmgr -o "FED1,FED2,FED3,FED4,$BOOT_ORDER"
fi
fi fi