ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes I5b4a87d6,I131315d4 am: 48c0de4907 am: 0bfe8df121

Browse source 
Change-Id: Id05a84d2584926d60ab5e5248348b835788a63e4
This commit is contained in:
Mark Salyzyn 2020-02-14 19:54:56 +00:00
commit cf044e0f1c
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
fs_mgr/fs_mgr_remount.cpp
View file

@ -80,9 +80,13 @@ const android::fs_mgr::FstabEntry* is_wrapped(const android::fs_mgr::Fstab& over
return &(*it); return &(*it);
} }
auto verbose = false;
void MyLogger(android::base::LogId id, android::base::LogSeverity severity, const char* tag, void MyLogger(android::base::LogId id, android::base::LogSeverity severity, const char* tag,
const char* file, unsigned int line, const char* message) { const char* file, unsigned int line, const char* message) {
fprintf(stderr, "%s\n", message); if (verbose || severity == android::base::ERROR || message[0] != '[') {
fprintf(stderr, "%s\n", message);
}
static auto logd = android::base::LogdLogger(); static auto logd = android::base::LogdLogger();
logd(id, severity, tag, file, line, message); logd(id, severity, tag, file, line, message);
} }
@ -131,10 +135,14 @@ static int do_remount(int argc, char* argv[]) {
{"fstab", required_argument, nullptr, 'T'}, {"fstab", required_argument, nullptr, 'T'},
{"help", no_argument, nullptr, 'h'}, {"help", no_argument, nullptr, 'h'},
{"reboot", no_argument, nullptr, 'R'}, {"reboot", no_argument, nullptr, 'R'},
{"verbose", no_argument, nullptr, 'v'},
{0, 0, nullptr, 0}, {0, 0, nullptr, 0},
}; };
for (int opt; (opt = ::getopt_long(argc, argv, "hRT:", longopts, nullptr)) != -1;) { for (int opt; (opt = ::getopt_long(argc, argv, "hRT:v", longopts, nullptr)) != -1;) {
switch (opt) { switch (opt) {
case 'h':
usage(SUCCESS);
break;
case 'R': case 'R':
can_reboot = true; can_reboot = true;
break; break;
@ -145,13 +153,13 @@ static int do_remount(int argc, char* argv[]) {
} }
fstab_file = optarg; fstab_file = optarg;
break; break;
case 'v':
verbose = true;
break;
default: default:
LOG(ERROR) << "Bad Argument -" << char(opt); LOG(ERROR) << "Bad Argument -" << char(opt);
usage(BADARG); usage(BADARG);
break; break;
case 'h':
usage(SUCCESS);
break;
} }
} }

6
fs_mgr/tests/adb-remount-test.sh
View file

@ -902,7 +902,11 @@ adb_sh ls -l /dev/block/by-name/ /dev/block/mapper/ </dev/null 2>/dev/null |
done done
# If reboot too soon after fresh flash, could trip device update failure logic # If reboot too soon after fresh flash, could trip device update failure logic
wait_for_screen if ! wait_for_screen && ${screen_wait}; then
screen_wait=false
echo "${ORANGE}[ WARNING ]${NORMAL} not healthy, no launcher, skipping wait for screen" >&2
fi
# Can we test remount -R command? # Can we test remount -R command?
OVERLAYFS_BACKING="cache mnt/scratch" OVERLAYFS_BACKING="cache mnt/scratch"
overlayfs_supported=true overlayfs_supported=true