blob: 10471bd525f6c12517c07571db07498a07dafbd4 [file] [log] [blame]
Jackeaglea3ae16b2018-12-04 11:30:49 -05001From 164b7dcc67770829a65b4de26f6662a87a4636f4 Mon Sep 17 00:00:00 2001
Jon West013ef582018-08-21 20:45:26 -04002From: Pierre-Hugues Husson <phh@phh.me>
3Date: Tue, 14 Aug 2018 19:33:03 +0200
Pierre-Hugues Husson5d5d68a2018-10-02 16:41:21 +02004Subject: [PATCH 2/3] Some kernel crashes when using too recent sdcardfs
Jon West013ef582018-08-21 20:45:26 -04005 options. Force everyone to old options
6
7Change-Id: Ia5cf1aa8dc07a0f4a78b4d8f760ca0944dabaa89
8---
9 sdcard/sdcard.cpp | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/sdcard/sdcard.cpp b/sdcard/sdcard.cpp
Jackeaglea3ae16b2018-12-04 11:30:49 -050013index f8f1cbb455..15b66acf7b 100644
Jon West013ef582018-08-21 20:45:26 -040014--- 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--
Jackeaglea3ae16b2018-12-04 11:30:49 -0500262.17.1
Jon West013ef582018-08-21 20:45:26 -040027