From cbc3c3ead5a29ca5d4f802793042d072b9fd25fb Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 27 Oct 2019 08:05:17 -0500
Subject: hscript: Implement Runner.Execute.network

---
 hscript/script.cc | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

(limited to 'hscript')

diff --git a/hscript/script.cc b/hscript/script.cc
index 5066b6b..1701657 100644
--- a/hscript/script.cc
+++ b/hscript/script.cc
@@ -35,6 +35,7 @@ typedef Horizon::Keys::Key *(*key_parse_fn)(const std::string &, int, int*, int*
 using namespace Horizon::Keys;
 
 namespace fs = boost::filesystem;
+using boost::system::error_code;
 
 const std::map<std::string, key_parse_fn> valid_keys = {
     {"network", &Network::parseFromData},
@@ -881,7 +882,7 @@ bool Script::validate() const {
 
 bool Script::execute() const {
     bool success;
-    boost::system::error_code ec;
+    error_code ec;
 
     /* assume create_directory will give us the error if removal fails */
     if(fs::exists("/tmp/horizon", ec)) {
@@ -1042,6 +1043,7 @@ bool Script::execute() const {
             std::ifstream contents(var_dent.path().string());
             if(!contents) {
                 output_error("internal", "cannot read network configuration");
+                EXECUTE_FAILURE("net");
                 continue;
             }
             conf << variable << "=\"";
@@ -1059,6 +1061,7 @@ bool Script::execute() const {
             if(!conf_file) {
                 output_error("internal", "cannot save network configuration "
                              "to target");
+                EXECUTE_FAILURE("net");
             } else {
                 conf_file << conf.str();
             }
@@ -1069,6 +1072,39 @@ bool Script::execute() const {
         EXECUTE_FAILURE("net");
         return false;
     }
+
+    if(this->internal->network->test()) {
+        bool do_wpa = !this->internal->ssids.empty();
+
+        if(opts.test(Simulate)) {
+            if(do_wpa) {
+                std::cout << "cp /target/etc/wpa_supplicant/wpa_supplicant.conf "
+                          << "/etc/wpa_supplicant/wpa_supplicant.conf"
+                          << std::endl;
+            }
+            std::cout << "cp /target/etc/conf.d/net /etc/conf.d/net"
+                      << std::endl;
+        } else {
+            if(do_wpa) {
+                fs::copy_file("/target/etc/wpa_supplicant/wpa_supplicant.conf",
+                          "/etc/wpa_supplicant/wpa_supplicant.conf",
+                          fs::copy_option::overwrite_if_exists, ec);
+                if(ec.failed()) {
+                    output_error("internal", "cannot use wireless configuration "
+                                 "during installation", ec.message());
+                    EXECUTE_FAILURE("net");
+                }
+            }
+            fs::copy_file("/target/etc/conf.d/net", "/etc/conf.d/net",
+                          fs::copy_option::overwrite_if_exists, ec);
+            if(ec.failed()) {
+                output_error("internal", "cannot use networking configuration "
+                             "during installation", ec.message());
+                EXECUTE_FAILURE("net");
+                return false;
+            }
+        }
+    }
     output_step_end("net");
 
     /**************** PKGDB ****************/
-- 
cgit v1.2.3-60-g2f50