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

vold: Don't bail out on init failure & bump version number

Browse source 
Signed-off-by: San Mehat <san@google.com>
This commit is contained in:
San Mehat 2010-03-02 13:16:33 -08:00
parent a1091cb0c4
commit f1b07fb5e3
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
main.cpp
View file

@ -42,7 +42,7 @@ int main() {
CommandListener *cl;
NetlinkManager *nm;
LOGI("Vold 2.0 (the revenge) firing up");
LOGI("Vold 2.1 (the revenge) firing up");
mkdir("/dev/block/vold", 0755);
@ -68,8 +68,7 @@ int main() {
}
if (process_config(vm)) {
LOGE("Error reading configuration (%s)", strerror(errno));
exit(1);
LOGE("Error reading configuration (%s)... continuing anyways", strerror(errno));
}
if (nm->start()) {
@ -89,18 +88,16 @@ int main() {
if ((fp = fopen("/sys/devices/virtual/switch/usb_mass_storage/state",
"r"))) {
if (!fgets(state, sizeof(state), fp)) {
LOGE("Failed to read switch state (%s)", strerror(errno));
fclose(fp);
exit(1);
}
if (!strncmp(state, "online", 6)) {
LOGD("Bootstrapped ums is connected");
vm->notifyUmsConnected(true);
if (fgets(state, sizeof(state), fp)) {
if (!strncmp(state, "online", 6)) {
vm->notifyUmsConnected(true);
} else {
vm->notifyUmsConnected(false);
}
} else {
LOGD("Bootstrapped ums is disconnected");
vm->notifyUmsConnected(false);
LOGE("Failed to read switch state (%s)", strerror(errno));
}
fclose(fp);
} else {
LOGW("No UMS switch available");