Merge pull request #155 from eax0r/master

Update GPT partition numbers
This commit is contained in:
MatMoul 2020-12-08 21:55:05 +01:00 committed by GitHub
commit 8a04d662d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

20
archfi
View file

@ -320,19 +320,19 @@ diskpartautoefi(){
echo "${txtautopartcreate//%1/swap}" echo "${txtautopartcreate//%1/swap}"
swapsize=$(cat /proc/meminfo | grep MemTotal | awk '{ print $2 }') swapsize=$(cat /proc/meminfo | grep MemTotal | awk '{ print $2 }')
swapsize=$((${swapsize}/1000))"M" swapsize=$((${swapsize}/1000))"M"
sgdisk ${device} -n=3:0:+${swapsize} -t=3:8200 sgdisk ${device} -n=2:0:+${swapsize} -t=2:8200
echo "${txtautopartcreate//%1/root}" echo "${txtautopartcreate//%1/root}"
sgdisk ${device} -n=4:0:0 sgdisk ${device} -n=3:0:0
echo "" echo ""
pressanykey pressanykey
if [ "${device::8}" == "/dev/nvm" ]; then if [ "${device::8}" == "/dev/nvm" ]; then
bootdev=${device}"p1" bootdev=${device}"p1"
swapdev=${device}"p3" swapdev=${device}"p2"
rootdev=${device}"p4" rootdev=${device}"p3"
else else
bootdev=${device}"1" bootdev=${device}"1"
swapdev=${device}"3" swapdev=${device}"2"
rootdev=${device}"4" rootdev=${device}"3"
fi fi
efimode="1" efimode="1"
fi fi
@ -349,9 +349,9 @@ diskpartautoefiusb(){
echo "${txtautopartcreate//%1/EFI boot}" echo "${txtautopartcreate//%1/EFI boot}"
sgdisk ${device} -n=1:0:+1024M -t=1:ef00 sgdisk ${device} -n=1:0:+1024M -t=1:ef00
echo "${txtautopartcreate//%1/BIOS boot}" echo "${txtautopartcreate//%1/BIOS boot}"
sgdisk ${device} -n=3:0:+31M -t=3:ef02 sgdisk ${device} -n=2:0:+31M -t=2:ef02
echo "${txtautopartcreate//%1/root}" echo "${txtautopartcreate//%1/root}"
sgdisk ${device} -n=4:0:0 sgdisk ${device} -n=3:0:0
echo "${txthybridpartcreate}" echo "${txthybridpartcreate}"
echo -e "r\nh\n3\nN\n\nY\nN\nw\nY\n" | gdisk ${device} echo -e "r\nh\n3\nN\n\nY\nN\nw\nY\n" | gdisk ${device}
echo "" echo ""
@ -359,11 +359,11 @@ diskpartautoefiusb(){
if [ "${device::8}" == "/dev/nvm" ]; then if [ "${device::8}" == "/dev/nvm" ]; then
bootdev=${device}"p1" bootdev=${device}"p1"
swapdev= swapdev=
rootdev=${device}"p4" rootdev=${device}"p3"
else else
bootdev=${device}"1" bootdev=${device}"1"
swapdev= swapdev=
rootdev=${device}"4" rootdev=${device}"3"
fi fi
efimode="2" efimode="2"
fi fi