From abc4f48e000aec6344e58462cca26ff9a62358d4 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 4 Oct 2021 15:22:29 -0700 Subject: [PATCH] Install nvme-cli tool and remove machine specific nvme files Fixes #1327 These machine specific files need to need to be created on the installed system, and should not be included in the image. (cherry picked from commit f031f2850b3823fca0360ee9668702ab4139ec5f) (cherry picked from commit 0099d618be177325487d2c23ec2d8a765d03ba1d) --- share/templates.d/99-generic/runtime-install.tmpl | 2 +- share/templates.d/99-generic/runtime-postinstall.tmpl | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl index 4b2800846..f8f988b84 100644 --- a/share/templates.d/99-generic/runtime-install.tmpl +++ b/share/templates.d/99-generic/runtime-install.tmpl @@ -140,7 +140,7 @@ installpkg rng-tools %if basearch in ("x86_64", "aarch64"): installpkg dmidecode %endif - +installpkg nvme-cli ## fonts & themes installpkg abattis-cantarell-vf-fonts diff --git a/share/templates.d/99-generic/runtime-postinstall.tmpl b/share/templates.d/99-generic/runtime-postinstall.tmpl index 528a2cda1..7fbdd2791 100644 --- a/share/templates.d/99-generic/runtime-postinstall.tmpl +++ b/share/templates.d/99-generic/runtime-postinstall.tmpl @@ -114,6 +114,10 @@ remove etc/lvm/cache remove etc/lvm/lvm.conf append etc/lvm/lvm.conf "global {\n\tuse_lvmetad = 1\n}\n" +## Remove machine specific nvme-cli files +remove etc/nvme/hostid +remove etc/nvme/hostnqn + ## TODO: we could run prelink here if we wanted? ## fix fonconfig cache containing timestamps