Make client-socket into a feature

cgwalters · cgwalters · commit 9d0f220d76f7 · 2022-07-26T21:15:08.000-04:00
So we can use it on F37+ builds.
diff --git a/Cargo.toml b/Cargo.toml
@@ -123,6 +123,8 @@ lto = "thin"
 # Note: If you add a feature here, you also probably want to update utils.rs:get_features()
 fedora-integration = []
 rhsm = ["libdnf-sys/rhsm"]
+# Enable hard requirement on `rpm-ostreed.socket`; requires https://bugzilla.redhat.com/show_bug.cgi?id=2110012
+client-socket = []
 bin-unit-tests = []
 # ASAN+UBSAN
 sanitizers = []
diff --git a/rust/src/client.rs b/rust/src/client.rs
@@ -154,6 +154,26 @@ pub(crate) fn client_handle_fd_argument(
     }
 }
 
+/// Connect to the client socket and ensure the daemon is initialized;
+/// this avoids DBus and ensures that we get any early startup errors
+/// returned cleanly.
+#[cfg(feature = "client-socket")]
+pub(crate) fn start_daemon_via_socket() -> Result<()> {
+    let address = "/run/rpm-ostree/client.sock";
+    tracing::debug!("Starting daemon via {address}");
+    let s = std::os::unix::net::UnixStream::connect(address)
+        .with_context(|| anyhow!("Failed to connect to {}", address))?;
+    let mut s = std::io::BufReader::new(s);
+    let mut r = String::new();
+    s.read_to_string(&mut r)
+        .context("Reading from client socket")?;
+    if r.is_empty() {
+        Ok(())
+    } else {
+        Err(anyhow!("{r}").into())
+    }
+}
+
 /// Explicitly ensure the daemon is started via systemd, if possible.
 ///
 /// This works around bugs from DBus activation, see
@@ -170,6 +190,12 @@ pub(crate) fn client_start_daemon() -> CxxResult<()> {
     if rustix::process::getuid().as_raw() != 0 {
         return Ok(());
     }
+
+    #[cfg(feature = "client-socket")]
+    {
+        start_daemon_via_socket()?;
+        return Ok(());
+    }
     // Unfortunately, RHEL8 systemd will count "systemctl start"
     // invocations against the restart limit, so query the status
     // first.
diff --git a/rust/src/daemon.rs b/rust/src/daemon.rs
@@ -8,7 +8,7 @@ use crate::cxxrsutil::*;
 use crate::ffi::{
     OverrideReplacementSource, OverrideReplacementType, ParsedRevision, ParsedRevisionKind,
 };
-use anyhow::{anyhow, format_err, Context, Result};
+use anyhow::{anyhow, format_err, Result};
 use cap_std::fs::Dir;
 use cap_std_ext::dirext::CapStdExtDirExt;
 use cap_std_ext::{cap_std, rustix};
@@ -135,25 +135,6 @@ fn deployment_populate_variant_origin(
     Ok(())
 }
 
-/// Connect to the client socket and ensure the daemon is initialized;
-/// this avoids DBus and ensures that we get any early startup errors
-/// returned cleanly.
-pub(crate) fn start_daemon_via_socket() -> CxxResult<()> {
-    let address = "/run/rpm-ostree/client.sock";
-    tracing::debug!("Starting daemon via {address}");
-    let s = std::os::unix::net::UnixStream::connect(address)
-        .with_context(|| anyhow!("Failed to connect to {}", address))?;
-    let mut s = std::io::BufReader::new(s);
-    let mut r = String::new();
-    s.read_to_string(&mut r)
-        .context("Reading from client socket")?;
-    if r.is_empty() {
-        Ok(())
-    } else {
-        Err(anyhow!("{r}").into())
-    }
-}
-
 async fn send_ok_result_to_client(_client: UnixStream) {
     // On success we close the stream without writing anything,
     // which acknowledges successful startup to the client.
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
@@ -300,7 +300,6 @@ pub mod ffi {
     // daemon.rs
     extern "Rust" {
         fn daemon_main(debug: bool) -> Result<()>;
-        fn start_daemon_via_socket() -> Result<()>;
         fn daemon_terminate();
         fn daemon_sanitycheck_environment(sysroot: &OstreeSysroot) -> Result<()>;
         fn deployment_generate_id(deployment: &OstreeDeployment) -> String;
diff --git a/src/app/libmain.cxx b/src/app/libmain.cxx
@@ -281,8 +281,6 @@ rpmostree_option_context_parse (GOptionContext *context, const GOptionEntry *mai
             return rpmostreecxx::client_throw_non_ostree_host_error (error);
         }
 
-      CXX_TRY (rpmostreecxx::start_daemon_via_socket (), error);
-
       /* root never needs to auth */
       if (getuid () != 0)
         /* ignore errors; we print out a warning if we fail to spawn pkttyagent */

Original file line number	Diff line number	Diff line change
`@@ -281,8 +281,6 @@ rpmostree_option_context_parse (GOptionContext context, const GOptionEntry mai`
`281`	`281`	`return rpmostreecxx::client_throw_non_ostree_host_error (error);`
`282`	`282`	`}`
`283`	`283`
`284`		`- CXX_TRY (rpmostreecxx::start_daemon_via_socket (), error);`
`285`		`-`
`286`	`284`	`/* root never needs to auth */`
`287`	`285`	`if (getuid () != 0)`
`288`	`286`	`/* ignore errors; we print out a warning if we fail to spawn pkttyagent */`