tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

recovery: Puke out an /etc/fstab so stuff like busybox/toybox is happy

Browse source 
* And disregard special mount flags on purpose because of certain
   dubious packages which "exec busybox mount".

Squashed:
Author: Alessandro Astone <ales.astone@gmail.com>
Date:   2021-03-26 18:02:34 +0100

    roots: Correct mount flags in /etc/fstab

    The logic here got inverted.

    Change-Id: I63c0d77fa17442ae8630015a52c7bf1be66f69f4

Change-Id: I163702c9bd7fca3d40676fd6d8476e8deb13acc0
This commit is contained in:
Steve Kondik 2013-11-24 21:40:09 -08:00 committed by zlewchan
parent cff2229a28
commit 9e4271094a
1 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
recovery_utils/roots.cpp
View file

@ -45,6 +45,16 @@ using android::fs_mgr::Fstab;
using android::fs_mgr::FstabEntry;
using android::fs_mgr::ReadDefaultFstab;
static void write_fstab_entry(const FstabEntry& entry, FILE* file) {
if (entry.fs_type != "emmc" && !entry.fs_mgr_flags.vold_managed && !entry.blk_device.empty() &&
entry.blk_device[0] == '/' && !entry.mount_point.empty() && entry.mount_point[0] == '/') {
fprintf(file, "%s ", entry.blk_device.c_str());
fprintf(file, "%s ", entry.mount_point.c_str());
fprintf(file, "%s ", entry.fs_type.c_str());
fprintf(file, "%s 0 0\n", !entry.fs_options.empty() ? entry.fs_options.c_str() : "defaults");
}
}
static Fstab fstab;
constexpr const char* CACHE_ROOT = "/cache";
@ -55,6 +65,12 @@ void load_volume_table() {
return;
}
// Create a boring /etc/fstab so tools like Busybox work
FILE* file = fopen("/etc/fstab", "w");
if (!file) {
LOG(ERROR) << "Unable to create /etc/fstab";
}
fstab.emplace_back(FstabEntry{
.blk_device = "ramdisk",
.mount_point = "/tmp",
@ -68,8 +84,15 @@ void load_volume_table() {
std::cout << " " << i << " " << entry.mount_point << " "
<< " " << entry.fs_type << " " << entry.blk_device << " " << entry.length
<< std::endl;
if (file) {
write_fstab_entry(entry, file);
}
}
std::cout << std::endl;
if (file) {
fclose(file);
}
}
Volume* volume_for_mount_point(const std::string& mount_point) {