particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

disk: rename MountpointAllowList -> MountpointPolicies

Browse source 
Now that the mountpoint allow is is actually a trie of path
policies we should rename it to better refelct its contents.
This commit is contained in:
Christian Kellner 2022-08-06 22:40:42 +02:00
parent de52e024a0
commit 3c3f1b4969
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/disk/disk.go
View file

@ -52,7 +52,7 @@ const (
XBootLDRPartitionGUID = "BC13C2FF-59E6-4262-A352-B275FD6F7172"
)
var MountpointAllowList = NewPathPolicies(map[string]PathPolicy{
var MountpointPolicies = NewPathPolicies(map[string]PathPolicy{
"/": {Exact: true},
"/var": {},
"/opt": {},

2
internal/distro/fedora/distro.go
View file

@ -696,7 +696,7 @@ func (t *imageType) checkOptions(customizations *blueprint.Customizations, optio
return fmt.Errorf("Custom mountpoints are not supported for ostree types")
}
err := disk.CheckMountpoints(mountpoints, disk.MountpointAllowList)
err := disk.CheckMountpoints(mountpoints, disk.MountpointPolicies)
if err != nil {
return err
}

2
internal/distro/rhel7/distro.go
View file

@ -433,7 +433,7 @@ func (t *imageType) checkOptions(customizations *blueprint.Customizations, optio
mountpoints := customizations.GetFilesystems()
err := disk.CheckMountpoints(mountpoints, disk.MountpointAllowList)
err := disk.CheckMountpoints(mountpoints, disk.MountpointPolicies)
if err != nil {
return err
}

2
internal/distro/rhel8/distro.go
View file

@ -663,7 +663,7 @@ func (t *imageType) checkOptions(customizations *blueprint.Customizations, optio
return fmt.Errorf("Custom mountpoints are not supported for ostree types")
}
err := disk.CheckMountpoints(mountpoints, disk.MountpointAllowList)
err := disk.CheckMountpoints(mountpoints, disk.MountpointPolicies)
if err != nil {
return err
}

2
internal/distro/rhel90/distro.go
View file

@ -599,7 +599,7 @@ func (t *imageType) checkOptions(customizations *blueprint.Customizations, optio
return fmt.Errorf("Custom mountpoints are not supported for ostree types")
}
err := disk.CheckMountpoints(mountpoints, disk.MountpointAllowList)
err := disk.CheckMountpoints(mountpoints, disk.MountpointPolicies)
if err != nil {
return err
}