Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-26 02:11:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix uid mapping in squashfs's made from tarballs (#2710)

Browse Source
This commit is contained in:
Aiden McClelland
2024-08-16 13:40:10 -06:00
committed by GitHub
parent f692ebbbb9
commit 6a8d8babce
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/dpkg-deps/depends
View File

@@ -47,6 +47,7 @@ smartmontools
socat
sqlite3
squashfs-tools
squashfs-tools-ng
sudo
systemd
systemd-resolved

20
core/startos/src/s9pk/v2/pack.rs
View File

@@ -60,14 +60,20 @@ impl SqfsDir {
.get_or_try_init(|| async move {
let guid = Guid::new();
let path = self.tmpdir.join(guid.as_ref()).with_extension("squashfs");
let mut cmd = Command::new("mksquashfs");
if self.path.extension().and_then(|s| s.to_str()) == Some("tar") {
cmd.arg("-tar");
Command::new("tar2sqfs")
.arg(&path)
.input(Some(&mut open_file(&self.path).await?))
.invoke(ErrorKind::Filesystem)
.await?;
} else {
Command::new("mksquashfs")
.arg(&self.path)
.arg(&path)
.invoke(ErrorKind::Filesystem)
.await?;
}
cmd.arg(&self.path)
.arg(&path)
.invoke(ErrorKind::Filesystem)
.await?;
Ok(MultiCursorFile::from(
open_file(&path)
.await
@@ -507,7 +513,7 @@ impl ImageSource {
Command::new(CONTAINER_TOOL)
.arg("export")
.arg(container.trim())
.pipe(Command::new("mksquashfs").arg("-").arg(&dest).arg("-tar"))
.pipe(Command::new("tar2sqfs").arg(&dest))
.capture(false)
.invoke(ErrorKind::Docker)
.await?;