diff options
Diffstat (limited to 'hscript')
-rw-r--r-- | hscript/disk.cc | 4 | ||||
-rw-r--r-- | hscript/meta.cc | 2 | ||||
-rw-r--r-- | hscript/script.cc | 2 | ||||
-rw-r--r-- | hscript/script.hh | 2 | ||||
-rw-r--r-- | hscript/script_e.cc | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/hscript/disk.cc b/hscript/disk.cc index b0608b3..049410e 100644 --- a/hscript/disk.cc +++ b/hscript/disk.cc @@ -792,7 +792,7 @@ bool Mount::execute() const { #endif /* We have to get the filesystem for the node. */ - if(script->options().test(Simulate) || script->options().test(Image)) { + if(script->options().test(Simulate) || script->options().test(ImageOnly)) { fstype = "auto"; } #ifdef HAS_INSTALL_ENV @@ -818,7 +818,7 @@ bool Mount::execute() const { std::cout << this->device() << " " << actual_mount << std::endl; } #ifdef HAS_INSTALL_ENV - else if(script->options().test(Image)) { + else if(script->options().test(ImageOnly)) { /* no-op; we don't mount during image creation (but we want fstab) */ } else { diff --git a/hscript/meta.cc b/hscript/meta.cc index e0c2b52..e419cde 100644 --- a/hscript/meta.cc +++ b/hscript/meta.cc @@ -95,7 +95,7 @@ bool Hostname::execute() const { std::cout << "hostname " << actual << std::endl; } #ifdef HAS_INSTALL_ENV - else if(script->options().test(Image)) { + else if(script->options().test(ImageOnly)) { /* no-op; we don't want to set the image builder's hostname */ } else { if(sethostname(actual.c_str(), actual.size()) == -1) { diff --git a/hscript/script.cc b/hscript/script.cc index cac5f3e..626b9e8 100644 --- a/hscript/script.cc +++ b/hscript/script.cc @@ -299,7 +299,7 @@ Script *Script::load(std::istream &sstream, const ScriptOptions &opts) { if(!the_script->internal->rootpw) { MISSING_ERROR("rootpw") } - if(the_script->internal->mounts.size() == 0 && !opts.test(Image)) { + if(the_script->internal->mounts.size() == 0 && !opts.test(ImageOnly)) { MISSING_ERROR("mount") } } diff --git a/hscript/script.hh b/hscript/script.hh index 5cb6db2..c874bd3 100644 --- a/hscript/script.hh +++ b/hscript/script.hh @@ -42,7 +42,7 @@ enum ScriptOptionFlags { /*! Just print commands that would be run, for testing/debug */ Simulate, /*! Installing to an image; don't mount anything */ - Image, + ImageOnly, /*! Count of flags */ NumFlags }; diff --git a/hscript/script_e.cc b/hscript/script_e.cc index 9e30b95..f4ca0a1 100644 --- a/hscript/script_e.cc +++ b/hscript/script_e.cc @@ -96,7 +96,7 @@ bool Script::execute() const { /**************** DISK SETUP ****************/ output_step_start("disk"); - if(!opts.test(Image)) { + if(!opts.test(ImageOnly)) { #ifdef HAS_INSTALL_ENV if(opts.test(InstallEnvironment)) ped_device_probe_all(); #endif /* HAS_INSTALL_ENV */ |