diff options
| author | pico.dev <pico.dev@gmail.com> | 2020-08-20 19:19:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-20 19:19:40 +0200 |
| commit | 2d0b579d2240e36d208917e4cf1744500c47070a (patch) | |
| tree | f959bbf36666e7dc11fefbfd05204df3f36af2ef | |
| parent | 677c7b3f471a1a00edb48425a60b5eaf4352211f (diff) | |
| parent | db6a65f3d663ef16cec7e465bb409374ca74adfe (diff) | |
Merge pull request #98 from rstrube/master
Minor tweaks to default parted commands for UEFI
| -rw-r--r-- | alis.conf | 2 | ||||
| -rwxr-xr-x | alis.sh | 4 |
2 files changed, 2 insertions, 4 deletions
@@ -19,7 +19,7 @@ LUKS_PASSWORD_RETYPE="archlinux" FILE_SYSTEM_TYPE="ext4 !btrfs !xfs" # (single) SWAP_SIZE="!2048 !4096 !8192" # (single, in megabytes) PARTITION_MODE="auto !custom !manual" -PARTITION_CUSTOM_PARTED_UEFI="mklabel gpt mkpart primary fat32 1MiB 512MiB mkpart primary $FILE_SYSTEM_TYPE 512MiB 100% set 1 boot" +PARTITION_CUSTOM_PARTED_UEFI="mklabel gpt mkpart ESP fat32 1MiB 512MiB mkpart root $FILE_SYSTEM_TYPE 512MiB 100% set 1 esp on" PARTITION_CUSTOM_PARTED_BIOS="mklabel msdos mkpart primary ext4 4MiB 512MiB mkpart primary $FILE_SYSTEM_TYPE 512MiB 100% set 1 boot on" PARTITION_CUSTOMMANUAL_BOOT="!/dev/sda1 !/dev/nvme0n1p1 !/dev/mmcblk0p1" PARTITION_CUSTOMMANUAL_ROOT="!/dev/sda2 !/dev/nvme0n1p2 !/dev/mmcblk0p2" @@ -356,7 +356,7 @@ function partition() { # setup if [ "$PARTITION_MODE" == "auto" ]; then - PARTITION_PARTED_UEFI="mklabel gpt mkpart primary fat32 1MiB 512MiB mkpart primary $FILE_SYSTEM_TYPE 512MiB 100% set 1 boot on" + PARTITION_PARTED_UEFI="mklabel gpt mkpart ESP fat32 1MiB 512MiB mkpart root $FILE_SYSTEM_TYPE 512MiB 100% set 1 esp on" PARTITION_PARTED_BIOS="mklabel msdos mkpart primary ext4 4MiB 512MiB mkpart primary $FILE_SYSTEM_TYPE 512MiB 100% set 1 boot on" if [ "$BIOS_TYPE" == "uefi" ]; then @@ -431,8 +431,6 @@ function partition() { if [ "$PARTITION_MODE" == "auto" -o "$PARTITION_MODE" == "custom" ]; then if [ "$BIOS_TYPE" == "uefi" ]; then parted -s $DEVICE $PARTITION_PARTED_UEFI - - sgdisk -t=$PARTITION_BOOT_NUMBER:ef00 $DEVICE if [ -n "$LUKS_PASSWORD" ]; then sgdisk -t=$PARTITION_ROOT_NUMBER:8309 $DEVICE elif [ "$LVM" == "true" ]; then |