Fixes for WSL subsystem

set client state option on re-read disable anonymous platform wsl plan classes when wsl not permitted
MrBrain295 · Jun 29, 2018 · f25b505 · f25b505
1 parent f951ecf
commit f25b505
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/client/cs_statefile.cpp b/client/cs_statefile.cpp
@@ -931,6 +931,13 @@ int CLIENT_STATE::parse_app_info(PROJECT* p, FILE* in) {
                 delete avp;
                 continue;
             }
+            if (cc_config.dont_use_wsl && strstr(avp->plan_class, "wsl")) {
+                msg_printf(p, MSG_INFO,
+                    "skipping wsl app in app_info.xml; wsl disabled in cc_config.xml"
+                );
+                delete avp;
+                continue;
+            }
             if (strlen(avp->platform) == 0) {
                 safe_strcpy(avp->platform, get_primary_platform());
             }

diff --git a/client/log_flags.cpp b/client/log_flags.cpp
@@ -196,6 +196,9 @@ void CC_CONFIG::show() {
     if (dont_use_vbox) {
         msg_printf(NULL, MSG_INFO, "Config: don't use VirtualBox");
     }
+    if (dont_use_wsl) {
+        msg_printf(NULL, MSG_INFO, "Config: don't use the Windows Subsystem for Linux");
+    }
     for (i=0; i<alt_platforms.size(); i++) {
         msg_printf(NULL, MSG_INFO,
             "Config: alternate platform: %s", alt_platforms[i].c_str()
@@ -362,6 +365,7 @@ int CC_CONFIG::parse_options_client(XML_PARSER& xp) {
         if (xp.parse_bool("lower_client_priority", lower_client_priority)) continue;
         if (xp.parse_bool("dont_suspend_nci", dont_suspend_nci)) continue;
         if (xp.parse_bool("dont_use_vbox", dont_use_vbox)) continue;
+        if (xp.parse_bool("dont_use_wsl", dont_use_wsl)) continue;
         if (xp.match_tag("exclude_gpu")) {
             EXCLUDE_GPU eg;
             retval = eg.parse(xp);