tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src/config/network.rs: only save attriubutes used by configuration method

This commit is contained in:
Dietmar Maurer 2020-04-22 12:42:09 +02:00
parent c016482c7a
commit f8e7ac686a
1 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/config/network.rs
View File

@ -97,13 +97,16 @@ impl Interface {
} }
} }
fn write_iface_attributes_v4(&self, w: &mut dyn Write) -> Result<(), Error> { fn write_iface_attributes_v4(&self, w: &mut dyn Write, method: NetworkConfigMethod) -> Result<(), Error> {
if let Some(address) = &self.cidr_v4 { if method == NetworkConfigMethod::Static {
writeln!(w, " address {}", address)?; if let Some(address) = &self.cidr_v4 {
} writeln!(w, " address {}", address)?;
if let Some(gateway) = &self.gateway_v4 { }
writeln!(w, " gateway {}", gateway)?; if let Some(gateway) = &self.gateway_v4 {
writeln!(w, " gateway {}", gateway)?;
}
} }
for option in &self.options_v4 { for option in &self.options_v4 {
writeln!(w, " {}", option)?; writeln!(w, " {}", option)?;
} }
@ -111,13 +114,16 @@ impl Interface {
Ok(()) Ok(())
} }
fn write_iface_attributes_v6(&self, w: &mut dyn Write) -> Result<(), Error> { fn write_iface_attributes_v6(&self, w: &mut dyn Write, method: NetworkConfigMethod) -> Result<(), Error> {
if let Some(address) = &self.cidr_v6 { if method == NetworkConfigMethod::Static {
writeln!(w, " address {}", address)?; if let Some(address) = &self.cidr_v6 {
} writeln!(w, " address {}", address)?;
if let Some(gateway) = &self.gateway_v6 { }
writeln!(w, " gateway {}", gateway)?; if let Some(gateway) = &self.gateway_v6 {
writeln!(w, " gateway {}", gateway)?;
}
} }
for option in &self.options_v6 { for option in &self.options_v6 {
writeln!(w, " {}", option)?; writeln!(w, " {}", option)?;
} }
@ -136,25 +142,28 @@ impl Interface {
} }
} }
if self.method_v4.is_none() && self.method_v6.is_none() { return Ok(()); }
if self.autostart { if self.autostart {
writeln!(w, "auto {}", self.name)?; writeln!(w, "auto {}", self.name)?;
} }
if self.method_v4 == self.method_v6 { if self.method_v4 == self.method_v6 {
let method = self.method_v4.unwrap_or(NetworkConfigMethod::Static); if let Some(method) = self.method_v4 {
writeln!(w, "iface {} {}", self.name, method_to_str(method))?; writeln!(w, "iface {} {}", self.name, method_to_str(method))?;
self.write_iface_attributes_v4(w)?; self.write_iface_attributes_v4(w, method)?;
self.write_iface_attributes_v6(w)?; self.write_iface_attributes_v6(w, method)?;
writeln!(w)?; writeln!(w)?;
}
} else { } else {
if let Some(method) = self.method_v4 { if let Some(method) = self.method_v4 {
writeln!(w, "iface {} inet {}", self.name, method_to_str(method))?; writeln!(w, "iface {} inet {}", self.name, method_to_str(method))?;
self.write_iface_attributes_v4(w)?; self.write_iface_attributes_v4(w, method)?;
writeln!(w)?; writeln!(w)?;
} }
if let Some(method) = self.method_v6 { if let Some(method) = self.method_v6 {
writeln!(w, "iface {} inet6 {}", self.name, method_to_str(method))?; writeln!(w, "iface {} inet6 {}", self.name, method_to_str(method))?;
self.write_iface_attributes_v6(w)?; self.write_iface_attributes_v6(w, method)?;
writeln!(w)?; writeln!(w)?;
} }
} }