vasilito
c0587f9a2d
The 556MB monolithic redox.patch was impossible to manage, unreviewable, blocked GitHub pushes, and could only grow. This commit: - Moves all 64 absorbed patches from absorbed/ to active use in base/ - Removes the absorbed/ directory (consolidation history is now PATCH-HISTORY.md) - Removes the redox.patch symlink from recipes/core/base/ - Fixes all recipe symlinks to point to active patches (not absorbed/) - Patches are now individually wired, reviewable, and independently rebasable The redox.patch mega-file is no longer needed — individual patches are applied directly from the recipe.toml patches list.
45 lines
1.2 KiB
Diff
45 lines
1.2 KiB
Diff
diff --git a/dhcpd/src/main.rs b/dhcpd/src/main.rs
|
|
index a95b703e..45b7eab2 100644
|
|
--- a/dhcpd/src/main.rs
|
|
+++ b/dhcpd/src/main.rs
|
|
@@ -446,19 +446,36 @@ fn dhcp(iface: &str, verbose: bool) -> Result<(), String> {
|
|
Ok(())
|
|
}
|
|
|
|
+fn auto_detect_iface() -> String {
|
|
+ if let Ok(dir) = std::fs::read_dir("/scheme/netcfg/ifaces") {
|
|
+ for entry in dir.flatten() {
|
|
+ if let Ok(name) = entry.file_name().into_string() {
|
|
+ if !name.is_empty() && name != "." && name != ".." {
|
|
+ return name;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ String::from("eth0")
|
|
+}
|
|
+
|
|
fn main() {
|
|
let mut verbose = false;
|
|
- let iface = "eth0";
|
|
+ let mut iface = String::new();
|
|
|
|
- //TODO: parse iface from the args
|
|
for arg in env::args().skip(1) {
|
|
match arg.as_ref() {
|
|
"-v" => verbose = true,
|
|
+ other if !other.starts_with('-') && iface.is_empty() => iface = other.to_string(),
|
|
_ => (),
|
|
}
|
|
}
|
|
|
|
- if let Err(err) = dhcp(iface, verbose) {
|
|
+ if iface.is_empty() {
|
|
+ iface = auto_detect_iface();
|
|
+ }
|
|
+
|
|
+ if let Err(err) = dhcp(&iface, verbose) {
|
|
eprintln!("dhcpd: {err}");
|
|
process::exit(1);
|
|
}
|