Ignore filesystem base when state image is provided

2018-10-08 18:42:20 -03:00 · 2018-10-08 18:42:20 -03:00 · aea2409b1d
parent e1ad19ed30
commit aea2409b1d
1 changed files with 8 additions and 1 deletions
--- a/src/browser/starter.js
+++ b/src/browser/starter.js
@ -550,7 +550,14 @@ V86Starter.prototype.continue_init = function(emulator, options)

        if(settings.fs9p && settings.fs9p_json)
        {
-            settings.fs9p.OnJSONLoaded(settings.fs9p_json);
+            if(!settings.initial_state)
+            {
+                settings.fs9p.OnJSONLoaded(settings.fs9p_json);
+            }
+            else
+            {
+                dbg_log("Filesystem basefs ignored: Overridden by state image");
+            }

            if(options["bzimage_initrd_from_filesystem"])
            {