summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2020-05-15 01:48:39 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2020-05-15 01:48:39 -0500
commitea9bfce0275e3e3f1b0fc04a099bb2deabb4e7ab (patch)
tree211f16241fc8b43b0ea5d0c0a40264539fae60a8
parentcdc8d198f140666848ed51091fbb7e0a90fea439 (diff)
downloadhorizon-ea9bfce0275e3e3f1b0fc04a099bb2deabb4e7ab.tar.gz
horizon-ea9bfce0275e3e3f1b0fc04a099bb2deabb4e7ab.tar.bz2
horizon-ea9bfce0275e3e3f1b0fc04a099bb2deabb4e7ab.tar.xz
horizon-ea9bfce0275e3e3f1b0fc04a099bb2deabb4e7ab.zip
hscript: Don't change networking in image mode
Network configuration on the host should not be changed if we are only creating an image.
-rw-r--r--hscript/script_e.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/hscript/script_e.cc b/hscript/script_e.cc
index 22b2ca6..a7bb6d2 100644
--- a/hscript/script_e.cc
+++ b/hscript/script_e.cc
@@ -446,7 +446,10 @@ bool Script::execute() const {
}
}
#ifdef HAS_INSTALL_ENV
- else {
+ else if(opts.test(ImageOnly)) {
+ /* Don't do anything with the network configuration if we are
+ * only creating an image. */
+ } else {
if(do_wpa) {
fs::copy_file(targ_etc + "/wpa_supplicant/wpa_supplicant.conf",
"/etc/wpa_supplicant/wpa_supplicant.conf",