diff options
| author | Jake Buchholz <tomalok@gmail.com> | 2018-12-02 19:38:49 -0800 |
|---|---|---|
| committer | Mike Crute <crutem@amazon.com> | 2018-12-02 19:58:49 -0800 |
| commit | 013c57122a89a94070afe264269293ae6bed5d8e (patch) | |
| tree | 3a95878193ebd4355572689117aaab3e69c4f6b3 | |
| parent | 5a06b6d8806ed9c1013894f99496bc72bc10f4f7 (diff) | |
| download | alpine-ec2-ami-013c57122a89a94070afe264269293ae6bed5d8e.tar.bz2 alpine-ec2-ami-013c57122a89a94070afe264269293ae6bed5d8e.tar.xz alpine-ec2-ami-013c57122a89a94070afe264269293ae6bed5d8e.zip | |
fix issue #24
* Latest Amazon Linux enables 64bid when creating ext4 partitions, which is incompatible with syslinux/extlinux bootloader. Explicitly disable 64bit support, as it's highly unlikely we'll need a boot volume >16 TiB.
* update-extlinux.conf - switch kernel default to 'virt', as 'hardened' no longer exists.
| -rwxr-xr-x | make_ami.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/make_ami.sh b/make_ami.sh index 45d8ab3..8d2c652 100755 --- a/make_ami.sh +++ b/make_ami.sh | |||
| @@ -67,7 +67,7 @@ make_filesystem() { | |||
| 67 | local device="$1" # target device path | 67 | local device="$1" # target device path |
| 68 | local target="$2" # mount target | 68 | local target="$2" # mount target |
| 69 | 69 | ||
| 70 | mkfs.ext4 "$device" | 70 | mkfs.ext4 -O ^64bit "$device" |
| 71 | e2label "$device" / | 71 | e2label "$device" / |
| 72 | mount "$device" "$target" | 72 | mount "$device" "$target" |
| 73 | } | 73 | } |
| @@ -187,7 +187,7 @@ setup_extlinux() { | |||
| 187 | -e "s|^[# ]*(default_kernel_opts)=.*|\1=\"console=ttyS0 console=tty0\"|" \ | 187 | -e "s|^[# ]*(default_kernel_opts)=.*|\1=\"console=ttyS0 console=tty0\"|" \ |
| 188 | -e "s|^[# ]*(serial_port)=.*|\1=ttyS0|" \ | 188 | -e "s|^[# ]*(serial_port)=.*|\1=ttyS0|" \ |
| 189 | -e "s|^[# ]*(modules)=.*|\1=sd-mod,usb-storage,ext4|" \ | 189 | -e "s|^[# ]*(modules)=.*|\1=sd-mod,usb-storage,ext4|" \ |
| 190 | -e "s|^[# ]*(default)=.*|\1=hardened|" \ | 190 | -e "s|^[# ]*(default)=.*|\1=virt|" \ |
| 191 | -e "s|^[# ]*(timeout)=.*|\1=1|" \ | 191 | -e "s|^[# ]*(timeout)=.*|\1=1|" \ |
| 192 | "$target"/etc/update-extlinux.conf | 192 | "$target"/etc/update-extlinux.conf |
| 193 | } | 193 | } |