Compare commits

..

7 Commits

Author SHA1 Message Date
amery 7ea3906d63 Merge branch 'pr-amery-wireguard-ini' into next-amery 2023-10-29 01:13:19 +00:00
amery 6e0bf95fdf Merge branch 'pr-amery-wg-auto-init' into next-amery 2023-10-29 01:13:13 +00:00
amery 472b014a74 Merge branch 'pr-amery-jpictl-flags' into next-amery 2023-10-29 01:13:07 +00:00
amery 30b15da87d Merge branch 'pr-amery-mkdirall' into next-amery 2023-10-29 01:13:00 +00:00
amery da38250465 jpictl: create machine directories on jpictl write
Signed-off-by: Alejandro Mery <amery@jpi.io>
2023-10-29 01:12:21 +00:00
amery bdf0192ac5 cluster: add MkdirAll() support
Signed-off-by: Alejandro Mery <amery@jpi.io>
2023-10-29 01:12:21 +00:00
amery 194f03c86a cluster: refactor Machine.ReadFile() and Machine.OpenFile()
Signed-off-by: Alejandro Mery <amery@jpi.io>
2023-10-29 01:12:21 +00:00
+2 -4
View File
@@ -12,10 +12,9 @@ import (
// OpenFile opens a file on the machine's config directory with the specified flags
func (m *Machine) OpenFile(name string, flags int, args ...any) (fs.File, error) {
base := m.zone.zones.dir
fullName := m.getFilename(name, args...)
return fs.OpenFile(base, fullName, flags, 0644)
return m.zone.zones.OpenFile(fullName, flags)
}
// CreateTruncFile creates or truncates a file on the machine's config directory
@@ -57,10 +56,9 @@ func (m *Machine) RemoveFile(name string, args ...any) error {
// ReadFile reads a file from the machine's config directory
func (m *Machine) ReadFile(name string, args ...any) ([]byte, error) {
base := m.zone.zones.dir
fullName := m.getFilename(name, args...)
return fs.ReadFile(base, fullName)
return m.zone.zones.ReadFile(fullName)
}
// WriteStringFile writes the given content to a file on the machine's config directory