fix: do not extract xattrs in unsquashfs

dsseng · dsseng · commit c254f261fdfc · 2024-11-28T19:57:48.000+01:00
Fix building on SELinux systems. Extracting xattrs led to return code 2 as a non-critical error. This should not influence extension build.

Signed-off-by: Dmitry Sharshakov &lt;dmitry.sharshakov@siderolabs.com&gt;
diff --git a/internal/pkg/extensions/kernel_modules.go b/internal/pkg/extensions/kernel_modules.go
@@ -194,7 +194,7 @@ func extractRootfsFromInitramfs(r io.Reader, rootfsFilePath string) error {
 }
 
 func unsquash(squashfsPath, dest, path string) error {
-	cmd := exec.Command("unsquashfs", "-d", dest, "-f", "-n", squashfsPath, path)
+	cmd := exec.Command("unsquashfs", "-no-xattrs", "-d", dest, "-f", "-n", squashfsPath, path)
 	cmd.Stderr = os.Stderr
 
 	return cmd.Run()

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ func extractRootfsFromInitramfs(r io.Reader, rootfsFilePath string) error {`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`func unsquash(squashfsPath, dest, path string) error {`
`197`		`- cmd := exec.Command("unsquashfs", "-d", dest, "-f", "-n", squashfsPath, path)`
	`197`	`+ cmd := exec.Command("unsquashfs", "-no-xattrs", "-d", dest, "-f", "-n", squashfsPath, path)`
`198`	`198`	`cmd.Stderr = os.Stderr`
`199`	`199`
`200`	`200`	`return cmd.Run()`