diff options
author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-06-23 19:16:03 -0500 |
---|---|---|
committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-06-23 19:16:03 -0500 |
commit | 85d91a9062c9bbf497f9ec4ba1b90909608329b8 (patch) | |
tree | 3bd95c8c057b4d93cb0ccbb30c7a2bd0b90629a9 | |
parent | ba41e758a786158c695229faa1068c06717bf79f (diff) | |
download | horizon-85d91a9062c9bbf497f9ec4ba1b90909608329b8.tar.gz horizon-85d91a9062c9bbf497f9ec4ba1b90909608329b8.tar.bz2 horizon-85d91a9062c9bbf497f9ec4ba1b90909608329b8.tar.xz horizon-85d91a9062c9bbf497f9ec4ba1b90909608329b8.zip |
hscript: Don't ensure device existence during image creation
-rw-r--r-- | hscript/script_v.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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 */ |