Disable automatic update checks if booting from a removable device.
BUG=5335
TEST=unit tests, gmerged to hard-drive as well as USB
Review URL: http://codereview.chromium.org/2868105
diff --git a/utils.cc b/utils.cc
index d691739..05acc15 100644
--- a/utils.cc
+++ b/utils.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "update_engine/utils.h"
+
#include <sys/mount.h>
#include <sys/stat.h>
#include <sys/types.h>
@@ -13,7 +14,12 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+
#include <algorithm>
+
+#include "base/file_path.h"
+#include "base/file_util.h"
+#include "base/string_util.h"
#include "chromeos/obsolete_logging.h"
#include "update_engine/file_writer.h"
#include "update_engine/omaha_request_params.h"
@@ -207,7 +213,10 @@
}
string RootDevice(const string& partition_device) {
- CHECK(!partition_device.empty());
+ FilePath device_path(partition_device);
+ if (device_path.DirName().value() != "/dev") {
+ return "";
+ }
string::const_iterator it = --partition_device.end();
for (; it >= partition_device.begin(); --it) {
if (!isdigit(*it))
@@ -230,6 +239,26 @@
return string(it + 1, partition_device.end());
}
+string SysfsBlockDevice(const string& device) {
+ FilePath device_path(device);
+ if (device_path.DirName().value() != "/dev") {
+ return "";
+ }
+ return FilePath("/sys/block").Append(device_path.BaseName()).value();
+}
+
+bool IsRemovableDevice(const std::string& device) {
+ string sysfs_block = SysfsBlockDevice(device);
+ string removable;
+ if (sysfs_block.empty() ||
+ !file_util::ReadFileToString(FilePath(sysfs_block).Append("removable"),
+ &removable)) {
+ return false;
+ }
+ TrimWhitespaceASCII(removable, TRIM_ALL, &removable);
+ return removable == "1";
+}
+
std::string ErrnoNumberAsString(int err) {
char buf[100];
buf[0] = '\0';