Revert "init: Terminate gracefully when CAP_SYS_BOOT is absent"
Bug: 63080844
This reverts commit 683ebc805982a6dbffd94d8a631c75e66c239a67.
Change-Id: I6074ff09300fd30bfc66881ded1c4f868a845a91
diff --git a/init/reboot.cpp b/init/reboot.cpp
index be1e760..df7912f 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -21,7 +21,6 @@
#include <linux/fs.h>
#include <mntent.h>
#include <selinux/selinux.h>
-#include <sys/capability.h>
#include <sys/cdefs.h>
#include <sys/ioctl.h>
#include <sys/mount.h>
@@ -40,7 +39,6 @@
#include <android-base/logging.h>
#include <android-base/macros.h>
#include <android-base/properties.h>
-#include <android-base/scopeguard.h>
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
#include <android-base/unique_fd.h>
@@ -164,30 +162,9 @@
LOG(WARNING) << "powerctl_shutdown_time_ms:" << std::to_string(t->duration_ms()) << ":" << stat;
}
-static bool IsRebootCapable() {
- cap_t caps = cap_init();
- auto scopeguard = android::base::make_scope_guard([&caps] { cap_free(caps); });
-
- // Assume we have the capability.
- cap_flag_value_t value = CAP_SET;
- if (!CAP_IS_SUPPORTED(CAP_SYS_BOOT) ||
- cap_get_flag(caps, CAP_SYS_BOOT, CAP_EFFECTIVE, &value) != 0) {
- PLOG(ERROR) << "cap_get_flag(CAP_BOOT, EFFECTIVE) failed";
- }
-
- return value == CAP_SET;
-}
-
static void __attribute__((noreturn))
RebootSystem(unsigned int cmd, const std::string& rebootTarget) {
LOG(INFO) << "Reboot ending, jumping to kernel";
-
- if (!IsRebootCapable()) {
- // On systems where init does not have the capability of rebooting the
- // device, just exit cleanly.
- exit(0);
- }
-
switch (cmd) {
case ANDROID_RB_POWEROFF:
reboot(RB_POWER_OFF);