mirror of
https://git.vectorsigma.ru/public/k3s.git
synced 2026-08-04 16:09:39 +00:00
Merge pull request #1440 from KnicKnic/master
do not rename inuse files
This commit is contained in:
@@ -133,19 +133,23 @@ func (p *Passwd) Write(passwdFile string) error {
|
||||
}
|
||||
|
||||
func writePasswords(passwdFile string, records [][]string) error {
|
||||
out, err := os.Create(passwdFile + ".tmp")
|
||||
err := func() error {
|
||||
// ensure to close tmp file before rename for filesystems like NTFS
|
||||
out, err := os.Create(passwdFile + ".tmp")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer out.Close()
|
||||
|
||||
if err := out.Chmod(0600); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return csv.NewWriter(out).WriteAll(records)
|
||||
}()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer out.Close()
|
||||
|
||||
if err := out.Chmod(0600); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err := csv.NewWriter(out).WriteAll(records); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return os.Rename(passwdFile+".tmp", passwdFile)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user