diff options
author | Mike Crute <mike@crute.us> | 2020-05-28 15:06:23 -0700 |
---|---|---|
committer | Mike Crute <mike@crute.us> | 2020-05-30 13:17:56 -0700 |
commit | b1da6a47d63b70b7100644faaa68b3ee0bedb66e (patch) | |
tree | 37784ee158ed71e3368817232ea3a878854f9b8e | |
parent | a0cc4d8a127fa336da0b67a62d93f693408cc128 (diff) | |
download | alpine-ec2-ami-b1da6a47d63b70b7100644faaa68b3ee0bedb66e.tar.bz2 alpine-ec2-ami-b1da6a47d63b70b7100644faaa68b3ee0bedb66e.tar.xz alpine-ec2-ami-b1da6a47d63b70b7100644faaa68b3ee0bedb66e.zip |
Embed nvme config
-rw-r--r-- | packer.conf | 4 | ||||
-rwxr-xr-x | scripts/nvme-ebs-links (renamed from scripts/nvme/nvme-ebs-links) | 0 | ||||
-rw-r--r-- | scripts/nvme/nvme-ebs-mdev.conf | 3 | ||||
-rwxr-xr-x | scripts/setup-ami | 6 |
4 files changed, 7 insertions, 6 deletions
diff --git a/packer.conf b/packer.conf index 6571e8d..dafb071 100644 --- a/packer.conf +++ b/packer.conf | |||
@@ -67,8 +67,8 @@ builders = [ | |||
67 | provisioners = [ | 67 | provisioners = [ |
68 | { | 68 | { |
69 | type = "file" | 69 | type = "file" |
70 | source = "../scripts/nvme/" | 70 | source = "../scripts/nvme-ebs-links" |
71 | destination = "/tmp" | 71 | destination = "/tmp/nvme-ebs-links" |
72 | } | 72 | } |
73 | { | 73 | { |
74 | type = "shell" | 74 | type = "shell" |
diff --git a/scripts/nvme/nvme-ebs-links b/scripts/nvme-ebs-links index 6ebdb10..6ebdb10 100755 --- a/scripts/nvme/nvme-ebs-links +++ b/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 @@ | |||
1 | # ebs nvme links | ||
2 | nvme[0-9]+n[0-9]+.* root:root 0660 */lib/mdev/nvme-ebs-links | ||
3 | |||
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() { | |||
149 | 149 | ||
150 | setup_mdev() { | 150 | setup_mdev() { |
151 | cp /tmp/nvme-ebs-links "$TARGET/lib/mdev" | 151 | cp /tmp/nvme-ebs-links "$TARGET/lib/mdev" |
152 | |||
152 | # insert nvme ebs mdev configs just above "# fallback" comment | 153 | # insert nvme ebs mdev configs just above "# fallback" comment |
153 | sed -n -i -e '/# fallback/r /tmp/nvme-ebs-mdev.conf' -e 1x -e '2,${x;p}' -e '${x;p}' "$TARGET/etc/mdev.conf" | 154 | sed -n -i \ |
155 | -e '/# fallback/i \\n# ebs nvme links\nnvme[0-9]+n[0-9]+.* root:root 0660 */lib/mdev/nvme-ebs-links' \ | ||
156 | -e 1x -e '2,${x;p}' -e '${x;p}' \ | ||
157 | "$TARGET/etc/mdev.conf" | ||
154 | } | 158 | } |
155 | 159 | ||
156 | create_initfs() { | 160 | create_initfs() { |