From 013c57122a89a94070afe264269293ae6bed5d8e Mon Sep 17 00:00:00 2001
From: Jake Buchholz <tomalok@gmail.com>
Date: Sun, 2 Dec 2018 19:38:49 -0800
Subject: 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.
---
 make_ami.sh | 4 ++--
 1 file 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() {
     local device="$1"  # target device path
     local target="$2"  # mount target
 
-    mkfs.ext4 "$device"
+    mkfs.ext4 -O ^64bit "$device"
     e2label "$device" /
     mount "$device" "$target"
 }
@@ -187,7 +187,7 @@ setup_extlinux() {
         -e "s|^[# ]*(default_kernel_opts)=.*|\1=\"console=ttyS0 console=tty0\"|" \
         -e "s|^[# ]*(serial_port)=.*|\1=ttyS0|" \
         -e "s|^[# ]*(modules)=.*|\1=sd-mod,usb-storage,ext4|" \
-        -e "s|^[# ]*(default)=.*|\1=hardened|" \
+        -e "s|^[# ]*(default)=.*|\1=virt|" \
         -e "s|^[# ]*(timeout)=.*|\1=1|" \
         "$target"/etc/update-extlinux.conf
 }
-- 
cgit v1.2.3