From 852ad6fb38f9bfc3fefe940478446e204c63806f Mon Sep 17 00:00:00 2001 From: Gregory Kurtzer Date: Sat, 23 Oct 2021 19:38:34 -0700 Subject: [PATCH] Fix error WRT deleting file in default overlay --- internal/app/wwctl/overlay/delete/main.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/internal/app/wwctl/overlay/delete/main.go b/internal/app/wwctl/overlay/delete/main.go index 7a3a17a5..69d20226 100644 --- a/internal/app/wwctl/overlay/delete/main.go +++ b/internal/app/wwctl/overlay/delete/main.go @@ -24,10 +24,6 @@ func CobraRunE(cmd *cobra.Command, args []string) error { fileName = args[2] } - if overlayName == "default" { - return errors.New("refusing to delete the default overlay") - } - if overlayKind != "system" && overlayKind != "runtime" { return errors.New("overlay kind must be of type 'system' or 'runtime'") } @@ -49,6 +45,9 @@ func CobraRunE(cmd *cobra.Command, args []string) error { } if fileName == "" { + if overlayName == "default" { + return errors.New("refusing to delete the default overlay") + } if Force { err := os.RemoveAll(overlayPath) if err != nil {