Merge pull request adafruit#811 from dhalbert/3.0_filesystem_writability_on_boot

tannewt · web-flow · commit c4cfd1170e77 · 2018-05-06T22:27:54.000-07:00
3.0: boot.py change of filesystem writability would get overridden.
diff --git a/main.c b/main.c
@@ -311,6 +311,10 @@ int __attribute__((used)) main(void) {
             filesystem_writable_by_python(true);
             f_open(fs, boot_output_file, CIRCUITPY_BOOT_OUTPUT_FILE, FA_WRITE | FA_CREATE_ALWAYS);
 
+            // Switch the filesystem back to non-writable by Python now instead of later,
+            // since boot.py might change it back to writable.
+            filesystem_writable_by_python(false);
+
             // Write version info to boot_out.txt.
             mp_hal_stdout_tx_str(MICROPY_FULL_VERSION_INFO);
             mp_hal_stdout_tx_str("\r\n");
@@ -327,7 +331,6 @@ int __attribute__((used)) main(void) {
             filesystem_flush();
             boot_output_file = NULL;
         }
-        filesystem_writable_by_python(false);
         #endif
 
         // Reset to remove any state that boot.py setup. It should only be used to
