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 f031f28) (cherry picked from commit 0099d61)
weldr · Jun 21, 2023 · abc4f48 · abc4f48
1 parent 0f1110f
commit abc4f48
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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