Browse Source

specify cwd before vfs-mount

David Rose 23 years ago
parent
commit
fed924dab0
1 changed files with 3 additions and 4 deletions
  1. 3 4
      panda/src/putil/virtualFileSystem.cxx

+ 3 - 4
panda/src/putil/virtualFileSystem.cxx

@@ -446,6 +446,9 @@ get_global_ptr() {
     // mount.
     // mount.
     _global_ptr->mount("/", "/", 0);
     _global_ptr->mount("/", "/", 0);
 
 
+    // And our initial cwd comes from the environment.
+    _global_ptr->chdir(ExecutionEnvironment::get_cwd());
+
     // Then, we add whatever mounts are listed in the Configrc file.
     // Then, we add whatever mounts are listed in the Configrc file.
     Config::ConfigTable::Symbol mounts;
     Config::ConfigTable::Symbol mounts;
     config_util.GetAll("vfs-mount", mounts);
     config_util.GetAll("vfs-mount", mounts);
@@ -495,10 +498,6 @@ get_global_ptr() {
         }
         }
       }
       }
     }
     }
-
-    // Finally, our cwd is initially from the environment, if that
-    // maps into our new VFS.
-    _global_ptr->chdir(ExecutionEnvironment::get_cwd());
   }
   }
 
 
   return _global_ptr;
   return _global_ptr;