Compare commits

..

6 Commits

Author SHA1 Message Date
amery bac2e19046 Merge branch 'pr-amery-wireguard-ini' into next-amery 2023-10-29 00:55:07 +00:00
amery 439e93e424 Merge branch 'pr-amery-wg-auto-init' into next-amery 2023-10-29 00:54:54 +00:00
amery 22111ecc05 Merge branch 'pr-amery-jpictl-flags' into next-amery 2023-10-29 00:54:29 +00:00
amery 8e940e0615 Merge branch 'pr-amery-mkdirall' into next-amery 2023-10-29 00:53:45 +00:00
amery b903ea957c jpictl: create machine directories on jpictl write
Signed-off-by: Alejandro Mery <amery@jpi.io>
2023-10-29 00:51:56 +00:00
amery 9f0792cde6 cluster: add MkdirAll() support
Signed-off-by: Alejandro Mery <amery@jpi.io>
2023-10-29 00:51:56 +00:00
+4 -2
View File
@@ -12,9 +12,10 @@ 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 m.zone.zones.OpenFile(fullName, flags)
return fs.OpenFile(base, fullName, flags, 0644)
}
// CreateTruncFile creates or truncates a file on the machine's config directory
@@ -56,9 +57,10 @@ 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 m.zone.zones.ReadFile(fullName)
return fs.ReadFile(base, fullName)
}
// WriteStringFile writes the given content to a file on the machine's config directory