From 3443484502b448fd00c5596ab546c190be781518 Mon Sep 17 00:00:00 2001 From: Simon de Vlieger Date: Wed, 23 Nov 2022 11:44:51 +0100 Subject: [PATCH] image: image_installer, use gzip compression --- internal/image/image_installer.go | 2 +- internal/manifest/iso_tree.go | 3 ++- .../manifests/fedora_35-aarch64-image_installer-boot.json | 4 ++-- .../fedora_35-aarch64-image_installer_with_users-boot.json | 4 ++-- .../data/manifests/fedora_35-x86_64-image_installer-boot.json | 4 ++-- .../fedora_35-x86_64-image_installer_with_users-boot.json | 4 ++-- .../manifests/fedora_36-aarch64-image_installer-boot.json | 4 ++-- .../fedora_36-aarch64-image_installer_with_users-boot.json | 4 ++-- .../data/manifests/fedora_36-x86_64-image_installer-boot.json | 4 ++-- .../fedora_36-x86_64-image_installer_with_users-boot.json | 4 ++-- .../manifests/fedora_37-aarch64-image_installer-boot.json | 4 ++-- .../fedora_37-aarch64-image_installer_with_users-boot.json | 4 ++-- .../data/manifests/fedora_37-x86_64-image_installer-boot.json | 4 ++-- .../fedora_37-x86_64-image_installer_with_users-boot.json | 4 ++-- .../manifests/fedora_38-aarch64-image_installer-boot.json | 4 ++-- .../fedora_38-aarch64-image_installer_with_users-boot.json | 4 ++-- .../data/manifests/fedora_38-x86_64-image_installer-boot.json | 4 ++-- .../fedora_38-x86_64-image_installer_with_users-boot.json | 4 ++-- 18 files changed, 35 insertions(+), 34 deletions(-) diff --git a/internal/image/image_installer.go b/internal/image/image_installer.go index d9879a1c0..1750b0606 100644 --- a/internal/image/image_installer.go +++ b/internal/image/image_installer.go @@ -62,7 +62,7 @@ func (img *ImageInstaller) InstantiateManifest(m *manifest.Manifest, img.OSVersion) interactiveDefaults := manifest.NewAnacondaInteractiveDefaults( - "file:///run/install/repo/liveimg.tar", + "file:///run/install/repo/liveimg.tar.gz", ) anacondaPipeline.ExtraPackages = img.ExtraBasePackages.Include diff --git a/internal/manifest/iso_tree.go b/internal/manifest/iso_tree.go index 912bfbf3d..7137ffe89 100644 --- a/internal/manifest/iso_tree.go +++ b/internal/manifest/iso_tree.go @@ -209,7 +209,8 @@ func (p *ISOTree) serialize() osbuild.Pipeline { } if p.OSPipeline != nil { - pipeline.AddStage(osbuild.NewTarStage(&osbuild.TarStageOptions{Filename: "/liveimg.tar"}, p.OSPipeline.name)) + // The TarStage has --autocompress + pipeline.AddStage(osbuild.NewTarStage(&osbuild.TarStageOptions{Filename: "/liveimg.tar.gz"}, p.OSPipeline.name)) // In the case of OSPipeline then the ImageInstaller has already set InteractiveDefaults on the anaconda-tree, // eliminating the need to set a separate kickstart here. diff --git a/test/data/manifests/fedora_35-aarch64-image_installer-boot.json b/test/data/manifests/fedora_35-aarch64-image_installer-boot.json index e5f30776c..40c7317f9 100644 --- a/test/data/manifests/fedora_35-aarch64-image_installer-boot.json +++ b/test/data/manifests/fedora_35-aarch64-image_installer-boot.json @@ -9931,7 +9931,7 @@ "options": { "path": "/usr/share/anaconda/interactive-defaults.ks", "liveimg": { - "url": "file:///run/install/repo/liveimg.tar" + "url": "file:///run/install/repo/liveimg.tar.gz" } } } @@ -12929,7 +12929,7 @@ } }, "options": { - "filename": "/liveimg.tar" + "filename": "/liveimg.tar.gz" } }, { diff --git a/test/data/manifests/fedora_35-aarch64-image_installer_with_users-boot.json b/test/data/manifests/fedora_35-aarch64-image_installer_with_users-boot.json index 70ef01853..0038822d3 100644 --- a/test/data/manifests/fedora_35-aarch64-image_installer_with_users-boot.json +++ b/test/data/manifests/fedora_35-aarch64-image_installer_with_users-boot.json @@ -9961,7 +9961,7 @@ "options": { "path": "/usr/share/anaconda/interactive-defaults.ks", "liveimg": { - "url": "file:///run/install/repo/liveimg.tar" + "url": "file:///run/install/repo/liveimg.tar.gz" } } } @@ -12959,7 +12959,7 @@ } }, "options": { - "filename": "/liveimg.tar" + "filename": "/liveimg.tar.gz" } }, { diff --git a/test/data/manifests/fedora_35-x86_64-image_installer-boot.json b/test/data/manifests/fedora_35-x86_64-image_installer-boot.json index a26ce048c..b41a70add 100644 --- a/test/data/manifests/fedora_35-x86_64-image_installer-boot.json +++ b/test/data/manifests/fedora_35-x86_64-image_installer-boot.json @@ -10124,7 +10124,7 @@ "options": { "path": "/usr/share/anaconda/interactive-defaults.ks", "liveimg": { - "url": "file:///run/install/repo/liveimg.tar" + "url": "file:///run/install/repo/liveimg.tar.gz" } } } @@ -13162,7 +13162,7 @@ } }, "options": { - "filename": "/liveimg.tar" + "filename": "/liveimg.tar.gz" } }, { diff --git a/test/data/manifests/fedora_35-x86_64-image_installer_with_users-boot.json b/test/data/manifests/fedora_35-x86_64-image_installer_with_users-boot.json index 1d81208b2..e2dbc5353 100644 --- a/test/data/manifests/fedora_35-x86_64-image_installer_with_users-boot.json +++ b/test/data/manifests/fedora_35-x86_64-image_installer_with_users-boot.json @@ -10154,7 +10154,7 @@ "options": { "path": "/usr/share/anaconda/interactive-defaults.ks", "liveimg": { - "url": "file:///run/install/repo/liveimg.tar" + "url": "file:///run/install/repo/liveimg.tar.gz" } } } @@ -13192,7 +13192,7 @@ } }, "options": { - "filename": "/liveimg.tar" + "filename": "/liveimg.tar.gz" } }, { diff --git a/test/data/manifests/fedora_36-aarch64-image_installer-boot.json b/test/data/manifests/fedora_36-aarch64-image_installer-boot.json index 47ebd7291..be4b67db0 100644 --- a/test/data/manifests/fedora_36-aarch64-image_installer-boot.json +++ b/test/data/manifests/fedora_36-aarch64-image_installer-boot.json @@ -10219,7 +10219,7 @@ "options": { "path": "/usr/share/anaconda/interactive-defaults.ks", "liveimg": { - "url": "file:///run/install/repo/liveimg.tar" + "url": "file:///run/install/repo/liveimg.tar.gz" } } } @@ -13585,7 +13585,7 @@ } }, "options": { - "filename": "/liveimg.tar" + "filename": "/liveimg.tar.gz" } }, { diff --git a/test/data/manifests/fedora_36-aarch64-image_installer_with_users-boot.json b/test/data/manifests/fedora_36-aarch64-image_installer_with_users-boot.json index 50cbbd4f9..9d30e56ea 100644 --- a/test/data/manifests/fedora_36-aarch64-image_installer_with_users-boot.json +++ b/test/data/manifests/fedora_36-aarch64-image_installer_with_users-boot.json @@ -10249,7 +10249,7 @@ "options": { "path": "/usr/share/anaconda/interactive-defaults.ks", "liveimg": { - "url": "file:///run/install/repo/liveimg.tar" + "url": "file:///run/install/repo/liveimg.tar.gz" } } } @@ -13615,7 +13615,7 @@ } }, "options": { - "filename": "/liveimg.tar" + "filename": "/liveimg.tar.gz" } }, { diff --git a/test/data/manifests/fedora_36-x86_64-image_installer-boot.json b/test/data/manifests/fedora_36-x86_64-image_installer-boot.json index 4c6332933..93d71a3fb 100644 --- a/test/data/manifests/fedora_36-x86_64-image_installer-boot.json +++ b/test/data/manifests/fedora_36-x86_64-image_installer-boot.json @@ -10412,7 +10412,7 @@ "options": { "path": "/usr/share/anaconda/interactive-defaults.ks", "liveimg": { - "url": "file:///run/install/repo/liveimg.tar" + "url": "file:///run/install/repo/liveimg.tar.gz" } } } @@ -13866,7 +13866,7 @@ } }, "options": { - "filename": "/liveimg.tar" + "filename": "/liveimg.tar.gz" } }, { diff --git a/test/data/manifests/fedora_36-x86_64-image_installer_with_users-boot.json b/test/data/manifests/fedora_36-x86_64-image_installer_with_users-boot.json index cb8291cb4..0003054b7 100644 --- a/test/data/manifests/fedora_36-x86_64-image_installer_with_users-boot.json +++ b/test/data/manifests/fedora_36-x86_64-image_installer_with_users-boot.json @@ -10442,7 +10442,7 @@ "options": { "path": "/usr/share/anaconda/interactive-defaults.ks", "liveimg": { - "url": "file:///run/install/repo/liveimg.tar" + "url": "file:///run/install/repo/liveimg.tar.gz" } } } @@ -13896,7 +13896,7 @@ } }, "options": { - "filename": "/liveimg.tar" + "filename": "/liveimg.tar.gz" } }, { diff --git a/test/data/manifests/fedora_37-aarch64-image_installer-boot.json b/test/data/manifests/fedora_37-aarch64-image_installer-boot.json index f89889406..216004e62 100644 --- a/test/data/manifests/fedora_37-aarch64-image_installer-boot.json +++ b/test/data/manifests/fedora_37-aarch64-image_installer-boot.json @@ -10345,7 +10345,7 @@ "options": { "path": "/usr/share/anaconda/interactive-defaults.ks", "liveimg": { - "url": "file:///run/install/repo/liveimg.tar" + "url": "file:///run/install/repo/liveimg.tar.gz" } } } @@ -13757,7 +13757,7 @@ } }, "options": { - "filename": "/liveimg.tar" + "filename": "/liveimg.tar.gz" } }, { diff --git a/test/data/manifests/fedora_37-aarch64-image_installer_with_users-boot.json b/test/data/manifests/fedora_37-aarch64-image_installer_with_users-boot.json index b627d495c..8e5dccbf5 100644 --- a/test/data/manifests/fedora_37-aarch64-image_installer_with_users-boot.json +++ b/test/data/manifests/fedora_37-aarch64-image_installer_with_users-boot.json @@ -10375,7 +10375,7 @@ "options": { "path": "/usr/share/anaconda/interactive-defaults.ks", "liveimg": { - "url": "file:///run/install/repo/liveimg.tar" + "url": "file:///run/install/repo/liveimg.tar.gz" } } } @@ -13787,7 +13787,7 @@ } }, "options": { - "filename": "/liveimg.tar" + "filename": "/liveimg.tar.gz" } }, { diff --git a/test/data/manifests/fedora_37-x86_64-image_installer-boot.json b/test/data/manifests/fedora_37-x86_64-image_installer-boot.json index b8b78b7d1..15dcdef9d 100644 --- a/test/data/manifests/fedora_37-x86_64-image_installer-boot.json +++ b/test/data/manifests/fedora_37-x86_64-image_installer-boot.json @@ -10546,7 +10546,7 @@ "options": { "path": "/usr/share/anaconda/interactive-defaults.ks", "liveimg": { - "url": "file:///run/install/repo/liveimg.tar" + "url": "file:///run/install/repo/liveimg.tar.gz" } } } @@ -14046,7 +14046,7 @@ } }, "options": { - "filename": "/liveimg.tar" + "filename": "/liveimg.tar.gz" } }, { diff --git a/test/data/manifests/fedora_37-x86_64-image_installer_with_users-boot.json b/test/data/manifests/fedora_37-x86_64-image_installer_with_users-boot.json index bcfffa40e..6e67359e9 100644 --- a/test/data/manifests/fedora_37-x86_64-image_installer_with_users-boot.json +++ b/test/data/manifests/fedora_37-x86_64-image_installer_with_users-boot.json @@ -10576,7 +10576,7 @@ "options": { "path": "/usr/share/anaconda/interactive-defaults.ks", "liveimg": { - "url": "file:///run/install/repo/liveimg.tar" + "url": "file:///run/install/repo/liveimg.tar.gz" } } } @@ -14076,7 +14076,7 @@ } }, "options": { - "filename": "/liveimg.tar" + "filename": "/liveimg.tar.gz" } }, { diff --git a/test/data/manifests/fedora_38-aarch64-image_installer-boot.json b/test/data/manifests/fedora_38-aarch64-image_installer-boot.json index 5156bcc81..0a4f2313f 100644 --- a/test/data/manifests/fedora_38-aarch64-image_installer-boot.json +++ b/test/data/manifests/fedora_38-aarch64-image_installer-boot.json @@ -10213,7 +10213,7 @@ "options": { "path": "/usr/share/anaconda/interactive-defaults.ks", "liveimg": { - "url": "file:///run/install/repo/liveimg.tar" + "url": "file:///run/install/repo/liveimg.tar.gz" } } } @@ -13637,7 +13637,7 @@ } }, "options": { - "filename": "/liveimg.tar" + "filename": "/liveimg.tar.gz" } }, { diff --git a/test/data/manifests/fedora_38-aarch64-image_installer_with_users-boot.json b/test/data/manifests/fedora_38-aarch64-image_installer_with_users-boot.json index 5734aa98c..c0e0af7d3 100644 --- a/test/data/manifests/fedora_38-aarch64-image_installer_with_users-boot.json +++ b/test/data/manifests/fedora_38-aarch64-image_installer_with_users-boot.json @@ -10243,7 +10243,7 @@ "options": { "path": "/usr/share/anaconda/interactive-defaults.ks", "liveimg": { - "url": "file:///run/install/repo/liveimg.tar" + "url": "file:///run/install/repo/liveimg.tar.gz" } } } @@ -13667,7 +13667,7 @@ } }, "options": { - "filename": "/liveimg.tar" + "filename": "/liveimg.tar.gz" } }, { diff --git a/test/data/manifests/fedora_38-x86_64-image_installer-boot.json b/test/data/manifests/fedora_38-x86_64-image_installer-boot.json index be54ccbdb..bf3bf2a49 100644 --- a/test/data/manifests/fedora_38-x86_64-image_installer-boot.json +++ b/test/data/manifests/fedora_38-x86_64-image_installer-boot.json @@ -10398,7 +10398,7 @@ "options": { "path": "/usr/share/anaconda/interactive-defaults.ks", "liveimg": { - "url": "file:///run/install/repo/liveimg.tar" + "url": "file:///run/install/repo/liveimg.tar.gz" } } } @@ -13902,7 +13902,7 @@ } }, "options": { - "filename": "/liveimg.tar" + "filename": "/liveimg.tar.gz" } }, { diff --git a/test/data/manifests/fedora_38-x86_64-image_installer_with_users-boot.json b/test/data/manifests/fedora_38-x86_64-image_installer_with_users-boot.json index e71a6dded..60065f998 100644 --- a/test/data/manifests/fedora_38-x86_64-image_installer_with_users-boot.json +++ b/test/data/manifests/fedora_38-x86_64-image_installer_with_users-boot.json @@ -10428,7 +10428,7 @@ "options": { "path": "/usr/share/anaconda/interactive-defaults.ks", "liveimg": { - "url": "file:///run/install/repo/liveimg.tar" + "url": "file:///run/install/repo/liveimg.tar.gz" } } } @@ -13932,7 +13932,7 @@ } }, "options": { - "filename": "/liveimg.tar" + "filename": "/liveimg.tar.gz" } }, {