diff options
| author | Ken Sumrall <ksumrall@android.com> | 2011-03-07 23:29:42 -0800 |
|---|---|---|
| committer | Ken Sumrall <ksumrall@android.com> | 2011-03-10 18:11:46 -0800 |
| commit | e3aeeb4de34dbb93e832e6554f494122ba633f3b (patch) | |
| tree | 2f600612cee4677c2ae4d99f6f791689c3e3e2c8 /toolbox/wipe.c | |
| parent | cf01597121c1c08780966f22e2a62386d0e1a08f (diff) | |
| download | system_core-e3aeeb4de34dbb93e832e6554f494122ba633f3b.tar.gz system_core-e3aeeb4de34dbb93e832e6554f494122ba633f3b.tar.bz2 system_core-e3aeeb4de34dbb93e832e6554f494122ba633f3b.zip | |
Try to unmount writable filesystems when rebooting
Ext4 filesystems like to be unmounted before rebooting. The Android system
doesn't have a traditional Linux init setup, and shutting down the system
was not much more than calling sync(2) and reboot(2). This adds a new
function to libcutils called android_reboot(). By default, it calls sync()
and then remounts all writable filesystems as read-only and marks them clean.
There is a flag parameter in which the caller can ask for sync() not to be
called, or to not remount the filesystems as read-only. Then it will call
reboot(2) as directed by the other parameters. This change also updates
adb, init and toolbox to call the new android_reboot() function.
Fixes bugs 3350709 and 3495575.
Change-Id: I16d71ffce3134310d7a260f61ec6f4dd204124a7
Diffstat (limited to 'toolbox/wipe.c')
| -rw-r--r-- | toolbox/wipe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toolbox/wipe.c b/toolbox/wipe.c index 7e263fd4..650a0d66 100644 --- a/toolbox/wipe.c +++ b/toolbox/wipe.c @@ -5,7 +5,7 @@ #include <string.h> #include <errno.h> #include <sys/types.h> -#include <sys/reboot.h> +#include <cutils/android_reboot.h> #include <sys/stat.h> #ifndef PATH_MAX @@ -63,7 +63,7 @@ int wipe_main (int argc, char *argv[]) wipe ("/system"); wipe ("/data"); fprintf(stdout, "Device nuked! Rebooting...\n"); - ret = reboot(RB_AUTOBOOT); + ret = android_reboot(ANDROID_RB_RESTART, 0, 0); if (ret < 0) { fprintf(stderr, "Reboot failed, %s\n", strerror(errno)); return 1; |
