From 05730d11d12b35308215e6598c508ed69f4d590a Mon Sep 17 00:00:00 2001 From: brett Date: Fri, 10 Aug 2018 12:29:07 -0700 Subject: [PATCH] coreos-base/oem-ec2-compat: Use Amazon's documented NVMe timeout https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-ebs-volumes.html#timeout-nvme-ebs-volumes --- .../coreos-base/oem-ec2-compat/files/grub-ec2.cfg | 2 +- ...m-ec2-compat-0.1.1-r1.ebuild => oem-ec2-compat-0.1.2.ebuild} | 0 .../{oem-ec2-compat-0.1.1-r1 => oem-ec2-compat-0.1.2} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/{oem-ec2-compat-0.1.1-r1.ebuild => oem-ec2-compat-0.1.2.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/{oem-ec2-compat-0.1.1-r1 => oem-ec2-compat-0.1.2} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-ec2.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-ec2.cfg index 12caf6e64c..ac574aae0f 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-ec2.cfg +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-ec2.cfg @@ -4,7 +4,7 @@ set oem_id="ec2" # Blacklist the Xen framebuffer module so it doesn't get loaded at boot # Disable `ens3` style names, so eth0 is used for both ixgbevf or xen. -set linux_append="modprobe.blacklist=xen_fbfront net.ifnames=0" +set linux_append="modprobe.blacklist=xen_fbfront net.ifnames=0 nvme_core.io_timeout=4294967295" if [ "$grub_platform" = pc ]; then set linux_console="console=ttyS0,115200n8" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.1-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-ec2-compat-0.1.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-ec2-compat-0.1.2 similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-ec2-compat-0.1.1-r1 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-ec2-compat-0.1.2