commit 1e8e2f135d888ff9eb408d7f391ed180837b9741
author Jorge E. Moreira <jemoreira@google.com> Mon Oct 07 18:09:49 2019 -0700
committer Jorge E. Moreira <jemoreira@google.com> Tue Oct 08 14:30:45 2019 -0700
tree 671415299f4db19ce40d6a628d99cfdefb3fcf25
parent 5861bb3f850c1d8d03bcaff44dc8f26e147296c5

Create internal directory in cuttlefish instance directory

Some entries in the internal directory are not meant to be accessed by
the user, but are rather for internal use of the virtual device (i.e
kernel logs pipe). This change moves those files to a directory named
internal to avoid confusing the users on what files they should read
from. For example: kernel.log is the file containing the kernel logs,
but kernel-log was the pipe used to pass the kernel logs from the vmm
to the kernel_log_monitor.

Bug: 141766622
Test: run locally
Change-Id: I1356feb2a6d6711112cfcfbb288ec8ffcd6d1613

host/commands/assemble_cvd/flags.cc

diff --git a/host/commands/assemble_cvd/flags.cc b/host/commands/assemble_cvd/flags.cc
index 76a31de..5374358 100644
--- a/host/commands/assemble_cvd/flags.cc
+++ b/host/commands/assemble_cvd/flags.cc
@@ -408,25 +408,30 @@
 
   tmp_config_obj.set_mempath(FLAGS_mempath);
   tmp_config_obj.set_ivshmem_qemu_socket_path(
-      tmp_config_obj.PerInstancePath("ivshmem_socket_qemu"));
+      tmp_config_obj.PerInstanceInternalPath("ivshmem_socket_qemu"));
   tmp_config_obj.set_ivshmem_client_socket_path(
-      tmp_config_obj.PerInstancePath("ivshmem_socket_client"));
+      tmp_config_obj.PerInstanceInternalPath("ivshmem_socket_client"));
   tmp_config_obj.set_ivshmem_vector_count(memory_layout.GetRegions().size());
 
   if (tmp_config_obj.adb_mode().count(vsoc::AdbMode::Usb) > 0) {
-    tmp_config_obj.set_usb_v1_socket_name(tmp_config_obj.PerInstancePath("usb-v1"));
+    tmp_config_obj.set_usb_v1_socket_name(
+        tmp_config_obj.PerInstanceInternalPath("usb-v1"));
     tmp_config_obj.set_vhci_port(FLAGS_vhci_port);
-    tmp_config_obj.set_usb_ip_socket_name(tmp_config_obj.PerInstancePath("usb-ip"));
+    tmp_config_obj.set_usb_ip_socket_name(
+        tmp_config_obj.PerInstanceInternalPath("usb-ip"));
   }
 
-  tmp_config_obj.set_kernel_log_pipe_name(tmp_config_obj.PerInstancePath("kernel-log"));
-  tmp_config_obj.set_console_pipe_name(tmp_config_obj.PerInstancePath("console-pipe"));
+  tmp_config_obj.set_kernel_log_pipe_name(
+      tmp_config_obj.PerInstanceInternalPath("kernel-log-pipe"));
+  tmp_config_obj.set_console_pipe_name(
+      tmp_config_obj.PerInstanceInternalPath("console-pipe"));
   tmp_config_obj.set_deprecated_boot_completed(FLAGS_deprecated_boot_completed);
   tmp_config_obj.set_console_path(tmp_config_obj.PerInstancePath("console"));
   tmp_config_obj.set_logcat_path(tmp_config_obj.PerInstancePath("logcat"));
   tmp_config_obj.set_logcat_receiver_binary(FLAGS_logcat_receiver_binary);
   tmp_config_obj.set_config_server_binary(FLAGS_config_server_binary);
-  tmp_config_obj.set_launcher_log_path(tmp_config_obj.PerInstancePath("launcher.log"));
+  tmp_config_obj.set_launcher_log_path(
+      tmp_config_obj.PerInstancePath("launcher.log"));
   tmp_config_obj.set_launcher_monitor_socket_path(
       tmp_config_obj.PerInstancePath("launcher_monitor.sock"));
 
@@ -750,6 +755,16 @@
     }
   }
 
+  auto internal_dir = FLAGS_instance_dir + "/" + vsoc::kInternalDirName;
+  if (!cvd::DirectoryExists(internal_dir)) {
+    if (mkdir(internal_dir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) <
+        0) {
+      LOG(ERROR) << "Failed to create internal instance directory: "
+                 << internal_dir << ". Error: " << errno;
+      exit(AssemblerExitCodes::kInstanceDirCreationError);
+    }
+  }
+
   if (!cvd::FileHasContent(FLAGS_boot_image)) {
     LOG(ERROR) << "File not found: " << FLAGS_boot_image;
     exit(cvd::kCuttlefishConfigurationInitError);