Merge "initialize inherited FD after logging" into main am: b7620f293e am: b11a912399
Original change: https://android-review.googlesource.com/c/platform/system/security/+/3518470
Change-Id: I0616ec0053d5f9ebf34efbeec909462e0d8b0797
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/prng_seeder/src/main.rs b/prng_seeder/src/main.rs
index d112d61..c6adfd4 100644
--- a/prng_seeder/src/main.rs
+++ b/prng_seeder/src/main.rs
@@ -69,11 +69,11 @@
}
fn setup() -> Result<(ConditionerBuilder, UnixListener)> {
+ configure_logging()?;
+ let cli = Cli::try_parse()?;
// SAFETY: nobody has taken ownership of the inherited FDs yet.
unsafe { rustutils::inherited_fd::init_once() }
.context("In setup, failed to own inherited FDs")?;
- configure_logging()?;
- let cli = Cli::try_parse()?;
// SAFETY: Nothing else sets the signal handler, so either it was set here or it is the default.
unsafe { signal::signal(signal::Signal::SIGPIPE, signal::SigHandler::SigIgn) }
.context("In setup, setting SIGPIPE to SIG_IGN")?;