Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7cc0e0c authored by Tao Bao's avatar Tao Bao Committed by Android (Google) Code Review
Browse files

Merge "Remove the obsolete reference to /file_contexts."

parents 0d24d9cb 7af933b6

roots.cpp

+1 −3
Original line number Diff line number Diff line
@@ -260,8 +260,6 @@ int format_volume(const char* volume, const char* directory) { 
          if (result == 0 && directory != nullptr) {

            const char* e2fsdroid_argv[] = { "/sbin/e2fsdroid_static",

                                             "-e",

                                             "-S",

                                             "/file_contexts",

                                             "-f",

                                             directory,

                                             "-a",

updater/install.cpp

+1 −2
Original line number Diff line number Diff line
@@ -322,8 +322,7 @@ Value* FormatFn(const char* name, State* state, const std::vector<std::unique_pt 
      return StringValue(location);

    }



    const char* e2fsdroid_argv[] = { "/sbin/e2fsdroid_static", "-e",   "-S",

                                     "/file_contexts",         "-a",   mount_point.c_str(),

    const char* e2fsdroid_argv[] = { "/sbin/e2fsdroid_static", "-e",   "-a", mount_point.c_str(),

                                     location.c_str(),         nullptr };

    status = exec_cmd(e2fsdroid_argv[0], const_cast<char**>(e2fsdroid_argv));

    if (status != 0) {