Revert "init: Wait for /dev/hvc1 during ARCVM first-stage mount"

This reverts commit b885e4ad53.

Reason for revert: No longer needed (using virtio-blk instead)

Change-Id: I667f0d4f58060e781a5e9b21c778cd568b92971a
This commit is contained in:
Tiffany Yang 2024-10-03 23:52:54 +00:00 committed by Gerrit Code Review
parent b885e4ad53
commit 36ea62f1fd
3 changed files with 0 additions and 12 deletions

View file

@ -305,11 +305,6 @@ bool FirstStageMountVBootV2::InitDevices() {
return false;
}
}
if (IsArcvm() && !block_dev_init_.InitHvcDevice("hvc1")) {
return false;
}
return true;
}

View file

@ -474,8 +474,6 @@ void SelinuxRestoreContext() {
RestoreconIfExists(SnapshotManager::GetGlobalRollbackIndicatorPath().c_str(), 0);
RestoreconIfExists("/metadata/gsi",
SELINUX_ANDROID_RESTORECON_RECURSE | SELINUX_ANDROID_RESTORECON_SKIP_SEHASH);
RestoreconIfExists("/dev/hvc1", 0);
}
int SelinuxKlogCallback(int type, const char* fmt, ...) {

View file

@ -18,7 +18,6 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/unistd.h>
#include <chrono>
#include <functional>
@ -109,10 +108,6 @@ inline constexpr bool IsMicrodroid() {
#endif
}
inline bool IsArcvm() {
return !access("/is_arcvm", F_OK);
}
bool Has32BitAbi();
std::string GetApexNameFromFileName(const std::string& path);