Merge pull request #811 from dhalbert/3.0_filesystem_writability_on_boot

3.0: boot.py change of filesystem writability would get overridden.
This commit is contained in:
Scott Shawcroft 2018-05-06 22:27:54 -07:00 committed by GitHub
commit c4cfd1170e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

5
main.c
View File

@ -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