Jon West | ac1d79e | 2019-04-16 20:29:14 -0400 | [diff] [blame] | 1 | From 98ab89f66725161127ac16b097e2cc493ac50ecf Mon Sep 17 00:00:00 2001 |
Jon West | 013ef58 | 2018-08-21 20:45:26 -0400 | [diff] [blame] | 2 | From: Pierre-Hugues Husson <phh@phh.me> |
| 3 | Date: Tue, 14 Aug 2018 19:33:03 +0200 |
Jon West | ac1d79e | 2019-04-16 20:29:14 -0400 | [diff] [blame] | 4 | Subject: [PATCH 2/7] Some kernel crashes when using too recent sdcardfs |
Jon West | 013ef58 | 2018-08-21 20:45:26 -0400 | [diff] [blame] | 5 | options. Force everyone to old options |
| 6 | |
| 7 | Change-Id: Ia5cf1aa8dc07a0f4a78b4d8f760ca0944dabaa89 |
| 8 | --- |
| 9 | sdcard/sdcard.cpp | 2 +- |
| 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 11 | |
| 12 | diff --git a/sdcard/sdcard.cpp b/sdcard/sdcard.cpp |
Jon West | ac1d79e | 2019-04-16 20:29:14 -0400 | [diff] [blame] | 13 | index f8f1cbb45..15b66acf7 100644 |
Jon West | 013ef58 | 2018-08-21 20:45:26 -0400 | [diff] [blame] | 14 | --- a/sdcard/sdcard.cpp |
| 15 | +++ b/sdcard/sdcard.cpp |
| 16 | @@ -102,7 +102,7 @@ static bool sdcardfs_setup(const std::string& source_path, const std::string& de |
| 17 | mode_t mask, bool derive_gid, bool default_normal, bool use_esdfs) { |
| 18 | // Try several attempts, each time with one less option, to gracefully |
| 19 | // handle older kernels that aren't updated yet. |
| 20 | - for (int i = 0; i < 4; i++) { |
| 21 | + for (int i = 2; i < 4; i++) { |
| 22 | std::string new_opts; |
| 23 | if (multi_user && i < 3) new_opts += "multiuser,"; |
| 24 | if (derive_gid && i < 2) new_opts += "derive_gid,"; |
| 25 | -- |
Jackeagle | a3ae16b | 2018-12-04 11:30:49 -0500 | [diff] [blame] | 26 | 2.17.1 |
Jon West | 013ef58 | 2018-08-21 20:45:26 -0400 | [diff] [blame] | 27 | |