From 0897a79c25f54d4d57f179c449de1738354a0e8f Mon Sep 17 00:00:00 2001 From: Itxaka Date: Wed, 31 Jan 2024 20:58:49 +0100 Subject: [PATCH] Remove the proper interactive-install entry by default (#220) --- pkg/constants/constants.go | 2 +- pkg/uki/install.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go index 511ba3b..f40ae7b 100644 --- a/pkg/constants/constants.go +++ b/pkg/constants/constants.go @@ -115,7 +115,7 @@ const ( ) func UkiDefaultSkipEntries() []string { - return []string{"interactive-install", "manual-install"} + return []string{"interactive-install", "install-mode-interactive"} } func GetCloudInitPaths() []string { diff --git a/pkg/uki/install.go b/pkg/uki/install.go index cf81595..d9eb050 100644 --- a/pkg/uki/install.go +++ b/pkg/uki/install.go @@ -139,6 +139,7 @@ func (i *InstallAction) Run() (err error) { // Remove entries // Read all confs + i.cfg.Logger.Debugf("Checking for entries to remove") err = fsutils.WalkDirFs(i.cfg.Fs, filepath.Join(i.spec.Partitions.EFI.MountPoint, "loader/entries/"), func(path string, info os.DirEntry, err error) error { i.cfg.Logger.Debugf("Checking file %s", path) if info.IsDir() {