kairos/immucore
1
0
Fork 0
mirror of https://github.com/kairos-io/immucore.git synced 2025-09-17 07:19:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(mount): call sync before/after operations (#288)

Browse Source 
* fix(mount): call sync after mount ops

Signed-off-by: mudler <mudler@kairos.io>

* refactor(mount): replace calls wrapped with sync

Signed-off-by: mudler <mudler@kairos.io>

* be consistent

Signed-off-by: mudler <mudler@kairos.io>

* lint fixes

Signed-off-by: mudler <mudler@kairos.io>

---------

Signed-off-by: mudler <mudler@kairos.io>
This commit is contained in:
Ettore Di Giacinto
2024-04-19 12:01:16 +02:00
committed by GitHub
parent 4916e6dba7
commit d14a047aa6
4 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
internal/utils/mounts.go
View File

@@ -201,13 +201,13 @@ func Fsck(device string) error {
func MountBasic() {
_ = os.MkdirAll("/proc", 0755)
if !IsMounted("/proc") {
_ = syscall.Mount("proc", "/proc", "proc", syscall.MS_NOSUID|syscall.MS_NODEV|syscall.MS_NOEXEC|syscall.MS_RELATIME, "")
_ = syscall.Mount("", "/proc", "", syscall.MS_SHARED, "")
_ = Mount("proc", "/proc", "proc", syscall.MS_NOSUID|syscall.MS_NODEV|syscall.MS_NOEXEC|syscall.MS_RELATIME, "")
_ = Mount("", "/proc", "", syscall.MS_SHARED, "")
}
_ = os.MkdirAll("/run", 0755)
if !IsMounted("/run") {
_ = syscall.Mount("tmpfs", "/run", "tmpfs", syscall.MS_NOSUID|syscall.MS_NODEV|syscall.MS_NOEXEC|syscall.MS_RELATIME, "mode=755")
_ = syscall.Mount("", "/run", "", syscall.MS_SHARED, "")
_ = Mount("tmpfs", "/run", "tmpfs", syscall.MS_NOSUID|syscall.MS_NODEV|syscall.MS_NOEXEC|syscall.MS_RELATIME, "mode=755")
_ = Mount("", "/run", "", syscall.MS_SHARED, "")
}
}
@@ -302,3 +302,17 @@ func ActivateLVM() error {
_, _ = CommandWithPath("udevadm --trigger")
return err
}
// Force flushing the data to disk.
func Sync() {
// wrapper isn't necessary, but leaving it here in case
// we want to add more logic in the future.
syscall.Sync()
}
// Mount will mount the given source to the target with the given fstype and flags.
func Mount(source string, target string, fstype string, flags uintptr, data string) (err error) {
Sync()
defer Sync()
return syscall.Mount(source, target, fstype, flags, data)
}