From b1da6a47d63b70b7100644faaa68b3ee0bedb66e Mon Sep 17 00:00:00 2001
From: Mike Crute <mike@crute.us>
Date: Thu, 28 May 2020 15:06:23 -0700
Subject: [PATCH] Embed nvme config

---
 packer.conf                       | 4 ++--
 scripts/{nvme => }/nvme-ebs-links | 0
 scripts/nvme/nvme-ebs-mdev.conf   | 3 ---
 scripts/setup-ami                 | 6 +++++-
 4 files changed, 7 insertions(+), 6 deletions(-)
 rename scripts/{nvme => }/nvme-ebs-links (100%)
 delete mode 100644 scripts/nvme/nvme-ebs-mdev.conf

diff --git a/packer.conf b/packer.conf
index 6571e8d..dafb071 100644
--- a/packer.conf
+++ b/packer.conf
@@ -67,8 +67,8 @@ builders = [
 provisioners = [
   {
     type        = "file"
-    source      = "../scripts/nvme/"
-    destination = "/tmp"
+    source      = "../scripts/nvme-ebs-links"
+    destination = "/tmp/nvme-ebs-links"
   }
   {
     type    = "shell"
diff --git a/scripts/nvme/nvme-ebs-links b/scripts/nvme-ebs-links
similarity index 100%
rename from scripts/nvme/nvme-ebs-links
rename to scripts/nvme-ebs-links
diff --git a/scripts/nvme/nvme-ebs-mdev.conf b/scripts/nvme/nvme-ebs-mdev.conf
deleted file mode 100644
index c30b6fd..0000000
--- a/scripts/nvme/nvme-ebs-mdev.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# ebs nvme links
-nvme[0-9]+n[0-9]+.*	root:root 0660 */lib/mdev/nvme-ebs-links
-
diff --git a/scripts/setup-ami b/scripts/setup-ami
index aaa0472..1b43495 100755
--- a/scripts/setup-ami
+++ b/scripts/setup-ami
@@ -149,8 +149,12 @@ install_core_packages() {
 
 setup_mdev() {
     cp /tmp/nvme-ebs-links "$TARGET/lib/mdev"
+
     # insert nvme ebs mdev configs just above "# fallback" comment
-    sed -n -i -e '/# fallback/r /tmp/nvme-ebs-mdev.conf' -e 1x -e '2,${x;p}' -e '${x;p}' "$TARGET/etc/mdev.conf"
+    sed -n -i \
+        -e '/# fallback/i \\n# ebs nvme links\nnvme[0-9]+n[0-9]+.*   root:root 0660 */lib/mdev/nvme-ebs-links' \
+        -e 1x -e '2,${x;p}' -e '${x;p}' \
+        "$TARGET/etc/mdev.conf"
 }
 
 create_initfs() {