From 85d91a9062c9bbf497f9ec4ba1b90909608329b8 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Tue, 23 Jun 2020 19:16:03 -0500 Subject: hscript: Don't ensure device existence during image creation --- hscript/script_v.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'hscript') diff --git a/hscript/script_v.cc b/hscript/script_v.cc index 542e9d3..0aeaad9 100644 --- a/hscript/script_v.cc +++ b/hscript/script_v.cc @@ -508,7 +508,7 @@ bool Horizon::Script::validate() const { } /* REQ: Runner.Validate.encrypt.Block */ - if(opts.test(InstallEnvironment)) { + if(opts.test(InstallEnvironment) && !opts.test(ImageOnly)) { #ifdef HAS_INSTALL_ENV CHECK_EXIST_PART_LV(crypt->device(), "encrypt", crypt->where()) #endif /* HAS_INSTALL_ENV */ @@ -528,7 +528,7 @@ bool Horizon::Script::validate() const { seen_fses.insert(fs->device()); /* REQ: Runner.Validate.fs.Block */ - if(opts.test(InstallEnvironment)) { + if(opts.test(InstallEnvironment) && !opts.test(ImageOnly)) { #ifdef HAS_INSTALL_ENV CHECK_EXIST_PART_LV(fs->device(), "fs", fs->where()) #endif /* HAS_INSTALL_ENV */ @@ -550,7 +550,7 @@ bool Horizon::Script::validate() const { } /* REQ: Runner.Validate.mount.Block */ - if(opts.test(InstallEnvironment)) { + if(opts.test(InstallEnvironment) && !opts.test(ImageOnly)) { #ifdef HAS_INSTALL_ENV CHECK_EXIST_PART_LV(mount->device(), "mount", mount->where()) #endif /* HAS_INSTALL_ENV */ -- cgit v1.2.3-70-g09d2