Merge pull request #524 from pb8o/net-toml-in-usr

netdog: look for net.toml under /usr

Author: ytsssun

sources/netdog/src/cli/mod.rs

@@ -9,6 +9,7 @@ use crate::net_config::{self, Interfaces};
 use crate::{
     DEFAULT_NET_CONFIG_FILE, KERNEL_CMDLINE, OVERRIDE_NET_CONFIG_FILE, PRIMARY_INTERFACE,
     PRIMARY_MAC_ADDRESS, PRIMARY_SYSCTL_CONF, SYSCTL_MARKER_FILE, SYSTEMD_SYSCTL, SYS_CLASS_NET,
+    USR_NET_CONFIG_FILE,
 };
 pub(crate) use generate_hostname::GenerateHostnameArgs;
 pub(crate) use generate_net_config::GenerateNetConfigArgs;
@@ -166,9 +167,10 @@ where
 fn fetch_net_config() -> Result<(Option<Box<dyn Interfaces>>, PathBuf)> {
     let override_path = PathBuf::from(OVERRIDE_NET_CONFIG_FILE);
     let default_path = PathBuf::from(DEFAULT_NET_CONFIG_FILE);
+    let usr_path = PathBuf::from(USR_NET_CONFIG_FILE);
     let cmdline = PathBuf::from(KERNEL_CMDLINE);
 
-    for path in [override_path, default_path] {
+    for path in [override_path, default_path, usr_path] {
         if Path::exists(&path) {
             return Ok((
                 net_config::from_path(&path).context(error::NetConfigParseSnafu { path: &path })?,

sources/netdog/src/main.rs

@@ -49,6 +49,7 @@ static PRIMARY_INTERFACE: &str = "/var/lib/netdog/primary_interface";
 static PRIMARY_MAC_ADDRESS: &str = "/var/lib/netdog/primary_mac_address";
 static DEFAULT_NET_CONFIG_FILE: &str = "/var/lib/bottlerocket/net.toml";
 static OVERRIDE_NET_CONFIG_FILE: &str = "/var/lib/netdog/net.toml";
+static USR_NET_CONFIG_FILE: &str = "/usr/share/bottlerocket/net.toml";
 static PRIMARY_SYSCTL_CONF: &str = "/etc/sysctl.d/90-primary_interface.conf";
 static SYSCTL_MARKER_FILE: &str = "/run/netdog/primary_sysctls_set";
 static SYS_CLASS_NET: &str = "/sys/class/net";