Merge pull request #699 from stgraber/main

incusd/instance/qemu: Make rootfs.img be 0600
lxc · Mar 29, 2024 · ec8d61a · ec8d61a
2 parents 8c6d7d6 + 60ce910
commit ec8d61a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/internal/server/instance/drivers/driver_qemu.go b/internal/server/instance/drivers/driver_qemu.go
@@ -6284,7 +6284,7 @@ func (d *qemu) Export(w io.Writer, properties map[string]string, expiration time
 		_ = from.Close()
 	}
 
-	to, err := os.OpenFile(fPath, unix.O_DIRECT|unix.O_CREAT, 0)
+	to, err := os.OpenFile(fPath, unix.O_DIRECT|unix.O_CREAT, 0600)
 	if err == nil {
 		cmd = append(cmd, "-t", "none")
 		_ = to.Close()

diff --git a/internal/server/storage/drivers/utils.go b/internal/server/storage/drivers/utils.go
@@ -604,8 +604,8 @@ func copyDevice(inputPath string, outputPath string) error {
 	cmd := []string{
 		"nice", "-n19", // Run dd with low priority to reduce CPU impact on other processes.
 		"dd", fmt.Sprintf("if=%s", inputPath), fmt.Sprintf("of=%s", outputPath),
-		"bs=16M",       // Use large buffer to reduce syscalls and speed up copy.
-		"conv=nocreat", // Don't create output file if missing (expect caller to have created output file).
+		"bs=16M",              // Use large buffer to reduce syscalls and speed up copy.
+		"conv=nocreat,sparse", // Don't create output file if missing (expect caller to have created output file), also attempt to make a sparse file.
 	}
 
 	// Check for Direct I/O support.