| 1 |
commit: 7fdb50bd3be0467d2bfefac8fde9554ed7956cce |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 10 21:01:55 2018 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 10 21:01:55 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/grss.git/commit/?id=7fdb50bd |
| 7 |
|
| 8 |
grs/Netboot.py: switch from xz to gzip compression |
| 9 |
|
| 10 |
grs/Netboot.py | 8 ++++---- |
| 11 |
1 file changed, 4 insertions(+), 4 deletions(-) |
| 12 |
|
| 13 |
diff --git a/grs/Netboot.py b/grs/Netboot.py |
| 14 |
index 985bcfd..307b3b3 100644 |
| 15 |
--- a/grs/Netboot.py |
| 16 |
+++ b/grs/Netboot.py |
| 17 |
@@ -65,9 +65,9 @@ class Netboot(HashIt): |
| 18 |
shutil.rmtree(initramfs_root, ignore_errors=True) |
| 19 |
os.makedirs(initramfs_root, mode=0o755, exist_ok=False) |
| 20 |
|
| 21 |
- # We will only use xz compression |
| 22 |
+ # We will use gzip compression |
| 23 |
initramfs_src = os.path.join(self.portage_configroot, 'boot/initramfs') |
| 24 |
- cmd = 'xz -dc %s | cpio -idv' % (initramfs_src) |
| 25 |
+ cmd = 'cat %s | gunzip | cpio -idv' % (initramfs_src) |
| 26 |
|
| 27 |
cwd = os.getcwd() |
| 28 |
os.chdir(initramfs_root) |
| 29 |
@@ -95,7 +95,7 @@ class Netboot(HashIt): |
| 30 |
shutil.rmtree(squashfs_dir, ignore_errors=True) |
| 31 |
os.makedirs(squashfs_dir, mode=0o755, exist_ok=False) |
| 32 |
squashfs_path = os.path.join(squashfs_dir, 'image.squashfs') |
| 33 |
- cmd = 'mksquashfs %s %s -xattrs -comp xz' % (self.portage_configroot, squashfs_path) |
| 34 |
+ cmd = 'mksquashfs %s %s -xattrs -comp gzip' % (self.portage_configroot, squashfs_path) |
| 35 |
Execute(cmd, timeout=None, logfile=self.logfile) |
| 36 |
|
| 37 |
# 4. Copy in the init script |
| 38 |
@@ -106,7 +106,7 @@ class Netboot(HashIt): |
| 39 |
|
| 40 |
# 5. Repack |
| 41 |
initramfs_dst = os.path.join(self.tmpdir, self.medium_name) |
| 42 |
- cmd = 'find . -print | cpio -H newc -o | xz -9e --check=none -z -f > %s' % initramfs_dst |
| 43 |
+ cmd = 'find . -print | cpio -H newc -o | gzip -9 -f > %s' % initramfs_dst |
| 44 |
|
| 45 |
cwd = os.getcwd() |
| 46 |
os.chdir(initramfs_root) |
Archives