6866041ff0
This CL fixes the design problem of the previous mechanism for providing the bootstrap bionic and the runtime bionic to the same path. Previously, bootstrap bionic was self-bind-mounted; i.e. /system/bin/libc.so is bind-mounted to itself. And the runtime bionic was bind-mounted on top of the bootstrap bionic. This has not only caused problems like `adb sync` not working(b/122737045), but also is quite difficult to understand due to the double-and-self mounting. This is the new design: Most importantly, these four are all distinct: 1) bootstrap bionic (/system/lib/bootstrap/libc.so) 2) runtime bionic (/apex/com.android.runtime/lib/bionic/libc.so) 3) mount point for 1) and 2) (/bionic/lib/libc.so) 4) symlink for 3) (/system/lib/libc.so -> /bionic/lib/libc.so) Inside the mount namespace of the pre-apexd processes, 1) is bind-mounted to 3). Likewise, inside the mount namespace of the post-apexd processes, 2) is bind-mounted to 3). In other words, there is no self-mount, and no double-mount. Another change is that mount points are under /bionic and the legacy paths become symlinks to the mount points. This is to make sure that there is no bind mounts under /system, which is breaking some apps. Finally, code for creating mount namespaces, mounting bionic, etc are refactored to mount_namespace.cpp Bug: 120266448 Bug: 123275379 Test: m, device boots, adb sync/push/pull works, especially with following paths: /bionic/lib64/libc.so /bionic/bin/linker64 /system/lib64/bootstrap/libc.so /system/bin/bootstrap/linker64 Change-Id: Icdfbdcc1efca540ac854d4df79e07ee61fca559f
71 lines
2.4 KiB
C++
71 lines
2.4 KiB
C++
/*
|
|
* Copyright (C) 2010 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef _INIT_UTIL_H_
|
|
#define _INIT_UTIL_H_
|
|
|
|
#include <sys/stat.h>
|
|
#include <sys/types.h>
|
|
|
|
#include <chrono>
|
|
#include <functional>
|
|
#include <ostream>
|
|
#include <string>
|
|
|
|
#include <android-base/chrono_utils.h>
|
|
#include <selinux/label.h>
|
|
|
|
#include "result.h"
|
|
|
|
#define COLDBOOT_DONE "/dev/.coldboot_done"
|
|
|
|
using android::base::boot_clock;
|
|
using namespace std::chrono_literals;
|
|
|
|
namespace android {
|
|
namespace init {
|
|
|
|
int CreateSocket(const char* name, int type, bool passcred, mode_t perm, uid_t uid, gid_t gid,
|
|
const char* socketcon);
|
|
|
|
Result<std::string> ReadFile(const std::string& path);
|
|
Result<Success> WriteFile(const std::string& path, const std::string& content);
|
|
|
|
Result<uid_t> DecodeUid(const std::string& name);
|
|
|
|
bool mkdir_recursive(const std::string& pathname, mode_t mode);
|
|
int wait_for_file(const char *filename, std::chrono::nanoseconds timeout);
|
|
void import_kernel_cmdline(bool in_qemu,
|
|
const std::function<void(const std::string&, const std::string&, bool)>&);
|
|
bool make_dir(const std::string& path, mode_t mode);
|
|
bool is_dir(const char* pathname);
|
|
bool expand_props(const std::string& src, std::string* dst);
|
|
|
|
// Returns the platform's Android DT directory as specified in the kernel cmdline.
|
|
// If the platform does not configure a custom DT path, returns the standard one (based in procfs).
|
|
const std::string& get_android_dt_dir();
|
|
// Reads or compares the content of device tree file under the platform's Android DT directory.
|
|
bool read_android_dt_file(const std::string& sub_path, std::string* dt_content);
|
|
bool is_android_dt_value_expected(const std::string& sub_path, const std::string& expected_content);
|
|
|
|
bool IsLegalPropertyName(const std::string& name);
|
|
|
|
void InitKernelLogging(char** argv, std::function<void(const char*)> abort_function);
|
|
bool IsRecoveryMode();
|
|
} // namespace init
|
|
} // namespace android
|
|
|
|
#endif
|