diff options
Diffstat (limited to 'build-arch-gce')
| -rwxr-xr-x | build-arch-gce | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/build-arch-gce b/build-arch-gce index b343b6f..e928e09 100755 --- a/build-arch-gce +++ b/build-arch-gce @@ -42,7 +42,7 @@ echo '- Setting up a loop device and partitioning the image.' loop_dev=$(losetup --find --partscan --show -- "$disk_raw") sfdisk --quiet -- "$loop_dev" <<-'EOF' label:gpt - type=C12A7328-F81F-11D2-BA4B-00A0C93EC93B,size=300MiB,name=efi + type=C12A7328-F81F-11D2-BA4B-00A0C93EC93B,size=300MiB,name=boot type=4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709,name=root EOF @@ -51,18 +51,18 @@ root_dev=${loop_dev}p2 mkfs.ext4 -q -L root -- "$root_dev" tune2fs -c 0 -i 0 -- "$root_dev" -echo '- Formatting the EFI partition.' -efi_dev=${loop_dev}p1 -mkfs.vfat -F32 -n EFI -- "$efi_dev" +echo '- Formatting the boot partition.' +boot_dev=${loop_dev}p1 +mkfs.vfat -F32 -n BOOT -- "$boot_dev" echo '- Mounting the root partition.' mount_dir=$work_dir/disk.mnt mkdir -- "$mount_dir" mount -- "$root_dev" "$mount_dir" -echo '- Mounting the EFI partition.' +echo '- Mounting the boot partition.' mkdir -p -- "$mount_dir/boot" -mount -- "$efi_dev" "$mount_dir/boot" +mount -- "$boot_dev" "$mount_dir/boot" echo '- Copy the host pacman database caches' mkdir -p $mount_dir/var/lib/pacman/sync @@ -77,7 +77,7 @@ cp -f ./sys/etc/pacman.conf "$mount_dir/etc/pacman.conf" echo '- Configuring fstab.' root_uuid=$(lsblk --noheadings --raw --output UUID -- "$root_dev") -efi_uuid=$(lsblk --noheadings --raw --output UUID -- "$efi_dev") +boot_uuid=$(lsblk --noheadings --raw --output UUID -- "$boot_dev") print_fstab() { printf '# LABEL=%s\n' "$1" printf 'UUID=%-20s' "$2" @@ -87,7 +87,7 @@ print_fstab() { } >> "$mount_dir/etc/fstab" { print_fstab root "$root_uuid" / ext4 rw,discard,errors=remount-ro,x-systemd.growfs 0 1 - print_fstab efi "$efi_uuid" /boot vfat uid=root,gid=root,umask=022,showexec 0 0 + print_fstab boot "$boot_uuid" /boot vfat uid=root,gid=root,umask=022,showexec 0 0 } echo '- Running additional setup in chroot.' |