AU: Include a bit flag (bit 31) in error codes to indicate non-normal boot mode.

utils.cc

 // Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "update_engine/utils.h"
 
 #include <sys/mount.h>
 #include <sys/resource.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include <algorithm>
 
 #include <base/eintr_wrapper.h>
 #include <base/file_path.h>
 #include <base/file_util.h>
 #include <base/rand_util.h>
 #include <base/string_util.h>
 #include <base/logging.h>
+#include <cros_boot_mode/boot_mode.h>
 #include <rootdev/rootdev.h>
 
 #include "update_engine/file_writer.h"
 #include "update_engine/omaha_request_params.h"
 #include "update_engine/subprocess.h"
 
 using std::min;
 using std::string;
 using std::vector;
 
 namespace chromeos_update_engine {
 
 namespace utils {
 
 static const char kOOBECompletedMarker[] = "/home/chronos/.oobe_completed";
 static const char kDevImageMarker[] = "/root/.dev_mode";
 
 bool IsOfficialBuild() {
   return !file_util::PathExists(FilePath(kDevImageMarker));
 }
 
 bool IsOOBEComplete() {
   return file_util::PathExists(FilePath(kOOBECompletedMarker));
 }
 
+bool IsNormalBootMode() {
+  cros_boot_mode::BootMode mode;
+  mode.Initialize(false, true);

[adlr, 2011/01/07 22:44:08]

perhaps a comment about what false, true means?

[petkov, 2011/01/07 22:50:45]

Done.

+  bool normal = mode.mode() == cros_boot_mode::BootMode::kNormal;
+  LOG_IF(INFO, !normal) << "Boot mode not normal: " << mode.mode_text();
+  return normal;
+}
+
 bool WriteFile(const char* path, const char* data, int data_len) {
   DirectFileWriter writer;
   TEST_AND_RETURN_FALSE_ERRNO(0 == writer.Open(path,
                                                O_WRONLY | O_CREAT | O_TRUNC,
                                                0600));
   ScopedFileWriterCloser closer(&writer);
   TEST_AND_RETURN_FALSE_ERRNO(data_len == writer.Write(data, data_len));
   return true;
 }
 
@@ skipping 455 matching lines @@
   int min = value - range / 2;
   int max = value + range - range / 2;
   return base::RandInt(min, max);
 }
 
 const char* const kStatefulPartition = "/mnt/stateful_partition";
 
 }  // namespace utils
 
 }  // namespace chromeos_update_engine