MCorange/wings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set permissions on the created image path

Browse Source
This commit is contained in:
DaneEveritt 2022-10-16 14:13:45 -07:00
parent 0407f22147
commit 99cb61a6ef
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/vhd/vhd.go
View File

@ -201,7 +201,7 @@ func (d *Disk) Unmount(ctx context.Context) error {
// //
// We use 1024 as the multiplier for all of the disk space logic within the application. // We use 1024 as the multiplier for all of the disk space logic within the application.
// Passing "K" (/1024) is the same as "KiB" for fallocate, but is different than "KB" (/1000). // Passing "K" (/1024) is the same as "KiB" for fallocate, but is different than "KB" (/1000).
func (d *Disk) alloc(ctx context.Context) Commander { func (d *Disk) allocationCmd(ctx context.Context) Commander {
if useDdAllocation { if useDdAllocation {
return d.commander(ctx, "dd", "if=/dev/zero", fmt.Sprintf("of=%s", d.diskPath), fmt.Sprintf("bs=%dk", d.size/1024), "count=1") return d.commander(ctx, "dd", "if=/dev/zero", fmt.Sprintf("of=%s", d.diskPath), fmt.Sprintf("bs=%dk", d.size/1024), "count=1")
} }
@ -228,7 +228,7 @@ func (d *Disk) Allocate(ctx context.Context) error {
if err := d.fs.MkdirAll(strings.TrimSuffix(d.diskPath, trim), 0700); err != nil { if err := d.fs.MkdirAll(strings.TrimSuffix(d.diskPath, trim), 0700); err != nil {
return errors.Wrap(err, "vhd: failed to create base vhd disk directory") return errors.Wrap(err, "vhd: failed to create base vhd disk directory")
} }
cmd := d.alloc(ctx) cmd := d.allocationCmd(ctx)
if _, err := cmd.Output(); err != nil { if _, err := cmd.Output(); err != nil {
msg := "vhd: failed to execute space allocation command" msg := "vhd: failed to execute space allocation command"
if v, ok := err.(*exec.ExitError); ok { if v, ok := err.(*exec.ExitError); ok {
@ -245,7 +245,7 @@ func (d *Disk) Allocate(ctx context.Context) error {
} }
return errors.Wrap(err, msg) return errors.Wrap(err, msg)
} }
return nil return errors.WithStack(d.fs.Chmod(d.diskPath, 0600))
} }
// MakeFilesystem will attempt to execute the "mkfs" command against the disk on // MakeFilesystem will attempt to execute the "mkfs" command against the disk on