Fix handling of CIDR values in warewulf.conf

- Fixes: #1541
- Fixes: #1594

Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
2025-02-03 17:01:57 -07:00
parent 8088112c30
commit 2e1466fc7e
11 changed files with 520 additions and 192 deletions

View File

@@ -152,7 +152,6 @@ option architecture-type code 93 = unsigned integer 16;
if exists user-class and option user-class = "iPXE" {
filename "http://192.168.0.1:9873/ipxe/${mac:hexhyp}?assetkey=${asset}&uuid=${uuid}";
} else {
if option architecture-type = 00:00 {
filename "/warewulf/undionly.kpxe";
}
@@ -166,7 +165,6 @@ if exists user-class and option user-class = "iPXE" {
filename "/warewulf/snponly.efi";
}
}
subnet 192.168.0.0 netmask 255.255.255.0 {
max-lease-time 120;
range 192.168.0.100 192.168.0.199;
@@ -201,7 +199,6 @@ option architecture-type code 93 = unsigned integer 16;
if exists user-class and option user-class = "iPXE" {
filename "http://192.168.0.1:9873/ipxe/${mac:hexhyp}?assetkey=${asset}&uuid=${uuid}";
} else {
if option architecture-type = 00:00 {
filename "/warewulf/undionly.kpxe";
}
@@ -215,7 +212,6 @@ if exists user-class and option user-class = "iPXE" {
filename "/warewulf/snponly.efi";
}
}
subnet 192.168.0.0 netmask 255.255.255.0 {
max-lease-time 120;
range 192.168.0.100 192.168.0.199;
@@ -278,7 +274,6 @@ dhcp-host=e6:92:39:49:7b:04,set:warewulf,node2,192.168.3.23,infinite
const host_exports string = `backupFile: true
writeFile: true
Filename: etc/exports
# This file is autogenerated by warewulf
/home 192.168.0.0/255.255.255.0(rw,sync)
/opt 192.168.0.0/255.255.255.0(ro,sync,no_root_squash)