Skip to content

Always run snapshot_hook_* as root #3076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cjreynol merged 1 commit into from
Aug 21, 2026
+8 −6
Merged

Always run snapshot_hook_* as root #3076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions base/cvd/cuttlefish/host/commands/run_cvd/boot_state_machine.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,9 +424,11 @@ class CvdBootStateMachine : public SetupFeature, public KernelLogPipeConsumer {
instance_.adb_ip_and_port());
adb_command.AddParameter("wait-for-device");
adb_command.AddParameter("shell");
adb_command.AddParameter("/vendor/bin/snapshot_hook_post_resume");
adb_command.AddParameter(
"su root /vendor/bin/snapshot_hook_post_resume");
CHECK_EQ(adb_command.Start().Wait(), 0)
<< "Failed to run /vendor/bin/snapshot_hook_post_resume";
<< "Failed to run su root "
"/vendor/bin/snapshot_hook_post_resume";
// Done last so that adb is more likely to be ready.
CHECK(cuttlefish::WriteAll(restore_complete_pipe_write, "1") == 1)
<< "Error writing to restore complete pipe: "
Expand Down
8 changes: 4 additions & 4 deletions base/cvd/cuttlefish/host/commands/run_cvd/server_loop_impl_snapshot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@ static Result<void> RunAdbShellCommand(
Result<void> ServerLoopImpl::HandleSuspend(ProcessMonitor& process_monitor) {
// right order: guest -> host
VLOG(0) << "Suspending the guest..";
CF_EXPECT(
RunAdbShellCommand(instance_, {"/vendor/bin/snapshot_hook_pre_suspend"}));
CF_EXPECT(RunAdbShellCommand(
instance_, {"su", "root", "/vendor/bin/snapshot_hook_pre_suspend"}));
CF_EXPECT(SuspendGuest());
VLOG(0) << "The guest is suspended.";
CF_EXPECT(process_monitor.SuspendMonitoredProcesses(),
Expand All @@ -207,8 +207,8 @@ Result<void> ServerLoopImpl::HandleResume(ProcessMonitor& process_monitor) {
VLOG(0) << "The host processes are resumed.";
VLOG(0) << "Resuming the guest..";
CF_EXPECT(ResumeGuest());
CF_EXPECT(
RunAdbShellCommand(instance_, {"/vendor/bin/snapshot_hook_post_resume"}));
CF_EXPECT(RunAdbShellCommand(
instance_, {"su", "root", "/vendor/bin/snapshot_hook_post_resume"}));
VLOG(0) << "The guest resumed.";
return {};
}
Expand Down
Loading