Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch RHEL10 back to lzma #1447

Merged
merged 2 commits into from
Jan 20, 2025
Merged

Switch RHEL10 back to lzma #1447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a557e8
Revert "erofs: Change the erofs compression default to zstd"
bcl Jan 20, 2025
7a0c301
erofs: Make smaller lzma erofs images by default
bcl Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lorax.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Requires: isomd5sum
Requires: module-init-tools
Requires: parted
Requires: squashfs-tools >= 4.2
Requires: erofs-utils >= 1.8.2
Requires: erofs-utils
Requires: util-linux
Requires: xz-lzma-compat
Requires: xz
Expand Down
4 changes: 2 additions & 2 deletions src/pylorax/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ def configure(self, conf_file="/etc/lorax/lorax.conf"):
self.conf.set("compression", "bcj", "on")

self.conf.add_section("compression.erofs")
self.conf.set("compression.erofs", "type", "zstd,8")
self.conf.set("compression.erofs", "args", "-Ededupe,all-fragments -C 65536")
self.conf.set("compression.erofs", "type", "lzma")
self.conf.set("compression.erofs", "args", "-E dedupe,all-fragments -C 131072 --all-time")

# read the config file
if os.path.isfile(conf_file):
Expand Down
2 changes: 1 addition & 1 deletion src/pylorax/imgutils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def mksquashfs(rootdir, outfile, compression="default", compressargs=None):
compressargs = ["-comp", compression] + compressargs
return execWithRedirect("mksquashfs", [rootdir, outfile] + compressargs)

def mkerofs(rootdir, outfile, compression="zstd", compressargs=None):
def mkerofs(rootdir, outfile, compression="lzma", compressargs=None):
'''Make an erofs image containing the given rootdir.'''
compressargs = compressargs or []
compressargs = ["-z", compression] + compressargs
Expand Down
4 changes: 2 additions & 2 deletions src/pylorax/treebuilder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,15 +263,15 @@ def create_ext4_runtime(self, outfile="/var/tmp/squashfs.img", compression="xz",
remove(workdir)
return rc

def create_erofs_runtime(self, outfile="/var/tmp/erofs.img", compression="zstd", compressargs=None, size=2):
def create_erofs_runtime(self, outfile="/var/tmp/erofs.img", compression="lzma", compressargs=None, size=2):
"""Create a plain erofs runtime"""
compressargs = compressargs or []
os.makedirs(os.path.dirname(outfile))

# erofs the rootfs
return imgutils.mkerofs(self.vars.root, outfile, compression, compressargs)

def create_erofs_ext4_runtime(self, outfile="/var/tmp/erofs.img", compression="zstd", compressargs=None, size=2):
def create_erofs_ext4_runtime(self, outfile="/var/tmp/erofs.img", compression="lzma", compressargs=None, size=2):
"""Create a erofs compressed ext4 runtime"""
# make live rootfs image - must be named "LiveOS/rootfs.img" for dracut
compressargs = compressargs or []
Expand Down
Loading