diff options
| author | Shulhan <ms@kilabit.info> | 2023-02-11 14:36:39 +0700 |
|---|---|---|
| committer | Shulhan <ms@kilabit.info> | 2023-02-11 14:45:09 +0700 |
| commit | cca56949a4af405fd93e9d6f7f85ab542f6b6ab2 (patch) | |
| tree | 6304e8c4c31fddc6567c840067ca5ab6db601099 | |
| parent | 7d02a718948a380c2c3a9070afe867f6d2d68c1e (diff) | |
| parent | f639b4f85a9d133f7b83127d94318bb34444fbac (diff) | |
| download | compute-archlinux-image-builder-cca56949a4af405fd93e9d6f7f85ab542f6b6ab2.tar.xz | |
Merge remote-tracking branch 'upstream/master'
This merge the upstream repository to our fork with some changes in
naming of boot dev and uuid.
# Conflicts:
# README.md
# build-arch-gce6
| -rw-r--r-- | README.md | 2 | ||||
| -rwxr-xr-x | build-arch-gce | 16 | ||||
| -rw-r--r-- | current-images.txt | 1 |
3 files changed, 10 insertions, 9 deletions
@@ -9,7 +9,7 @@ installation, while still allowing it to be fully functional and optimized for Compute Engine. Notable choices made and differences compared to a standard Arch Linux installation are the following: -- systemd-boot is used with UEFI-based boot and a GPT partition table. +- systemd-boot is used with a UEFI-based boot and a GPT partition table. - Serial console logging is enabled from kernel command line and journald is configured to forward to it. - Block multiqueue is configured from the kernel command line to optimize 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.' diff --git a/current-images.txt b/current-images.txt index 581efbf..51dbf95 100644 --- a/current-images.txt +++ b/current-images.txt @@ -7,3 +7,4 @@ arch-v20210124 arch-linux-gce arch READY arch-v20220315 arch-linux-gce arch READY arch-v20220514 arch-linux-gce arch READY arch-v20220630 arch-linux-gce arch READY +arch-v20220910 arch-linux-gce arch READY |