diff --git a/internal/distro/rhel8/pipelines.go b/internal/distro/rhel8/pipelines.go index d2fade465..d258ea7da 100644 --- a/internal/distro/rhel8/pipelines.go +++ b/internal/distro/rhel8/pipelines.go @@ -935,7 +935,7 @@ func ostreeDeployPipeline( OSName: osname, }, )) - p.AddStage(osbuild.NewOSTreeConfigStage(ostreeConfigStageOptions(repoPath, true))) + p.AddStage(osbuild.NewOSTreeConfigStage(ostreeConfigStageOptions(repoPath, false))) p.AddStage(osbuild.NewMkdirStage(efiMkdirStageOptions())) kernelOpts := osbuild.GenImageKernelOptions(pt) p.AddStage(osbuild.NewOSTreeDeployStage( diff --git a/internal/distro/rhel9/pipelines.go b/internal/distro/rhel9/pipelines.go index f5f073e88..f5d69d415 100644 --- a/internal/distro/rhel9/pipelines.go +++ b/internal/distro/rhel9/pipelines.go @@ -931,7 +931,7 @@ func ostreeDeployPipeline( OSName: osname, }, )) - p.AddStage(osbuild.NewOSTreeConfigStage(ostreeConfigStageOptions(repoPath, true))) + p.AddStage(osbuild.NewOSTreeConfigStage(ostreeConfigStageOptions(repoPath, false))) p.AddStage(osbuild.NewMkdirStage(efiMkdirStageOptions())) kernelOpts := osbuild.GenImageKernelOptions(pt) p.AddStage(osbuild.NewOSTreeDeployStage( diff --git a/test/data/manifests/centos_8-aarch64-edge_raw_image-boot.json b/test/data/manifests/centos_8-aarch64-edge_raw_image-boot.json index 7562c4dba..b5feab2ab 100644 --- a/test/data/manifests/centos_8-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/centos_8-aarch64-edge_raw_image-boot.json @@ -2466,7 +2466,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -10031,5 +10031,6 @@ "check_gpg": true } ] - } + }, + "no-image-info": true } diff --git a/test/data/manifests/centos_8-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/centos_8-aarch64-edge_simplified_installer-boot.json index 563fd6ddd..125261d8d 100644 --- a/test/data/manifests/centos_8-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/centos_8-aarch64-edge_simplified_installer-boot.json @@ -33,7 +33,6 @@ } } }, - "no-image-info": true, "manifest": { "version": "2", "pipelines": [ @@ -2507,7 +2506,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -16978,5 +16977,6 @@ "check_gpg": true } ] - } + }, + "no-image-info": true } diff --git a/test/data/manifests/centos_8-x86_64-edge_raw_image-boot.json b/test/data/manifests/centos_8-x86_64-edge_raw_image-boot.json index d2b1549d4..97e3d6e12 100644 --- a/test/data/manifests/centos_8-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/centos_8-x86_64-edge_raw_image-boot.json @@ -2514,7 +2514,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -10184,5 +10184,6 @@ "check_gpg": true } ] - } + }, + "no-image-info": true } diff --git a/test/data/manifests/centos_8-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/centos_8-x86_64-edge_simplified_installer-boot.json index c98b10045..e36bf75be 100644 --- a/test/data/manifests/centos_8-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/centos_8-x86_64-edge_simplified_installer-boot.json @@ -33,7 +33,6 @@ } } }, - "no-image-info": true, "manifest": { "version": "2", "pipelines": [ @@ -2571,7 +2570,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -17292,5 +17291,6 @@ "check_gpg": true } ] - } + }, + "no-image-info": true } diff --git a/test/data/manifests/centos_9-aarch64-edge_raw_image-boot.json b/test/data/manifests/centos_9-aarch64-edge_raw_image-boot.json index aaa73e5fc..b353d87d6 100644 --- a/test/data/manifests/centos_9-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/centos_9-aarch64-edge_raw_image-boot.json @@ -2378,7 +2378,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -8652,5 +8652,6 @@ "check_gpg": true } ] - } + }, + "no-image-info": true } diff --git a/test/data/manifests/centos_9-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/centos_9-aarch64-edge_simplified_installer-boot.json index 9677e2d21..0d72f9ca3 100644 --- a/test/data/manifests/centos_9-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/centos_9-aarch64-edge_simplified_installer-boot.json @@ -33,7 +33,6 @@ } } }, - "no-image-info": true, "manifest": { "version": "2", "pipelines": [ @@ -2427,7 +2426,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -15563,5 +15562,6 @@ "check_gpg": true } ] - } + }, + "no-image-info": true } diff --git a/test/data/manifests/centos_9-x86_64-edge_raw_image-boot.json b/test/data/manifests/centos_9-x86_64-edge_raw_image-boot.json index 7d95c1e0d..574c0d76d 100644 --- a/test/data/manifests/centos_9-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/centos_9-x86_64-edge_raw_image-boot.json @@ -2441,7 +2441,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -8833,5 +8833,6 @@ "check_gpg": true } ] - } + }, + "no-image-info": true } diff --git a/test/data/manifests/centos_9-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/centos_9-x86_64-edge_simplified_installer-boot.json index b563d4069..0aab946a6 100644 --- a/test/data/manifests/centos_9-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/centos_9-x86_64-edge_simplified_installer-boot.json @@ -39,7 +39,6 @@ } } }, - "no-image-info": true, "manifest": { "version": "2", "pipelines": [ @@ -2490,7 +2489,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -15860,5 +15859,6 @@ "check_gpg": true } ] - } + }, + "no-image-info": true } diff --git a/test/data/manifests/rhel_8-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_8-aarch64-edge_raw_image-boot.json index 299fb72a3..c01767231 100644 --- a/test/data/manifests/rhel_8-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_8-aarch64-edge_raw_image-boot.json @@ -984,7 +984,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -7905,5 +7905,6 @@ "checksum": "sha256:340b3c65becfca3d39f2afeed9659505a33ee870270c4d115d9fefe8929ff806" } ] - } + }, + "no-image-info": true } diff --git a/test/data/manifests/rhel_8-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_8-aarch64-edge_simplified_installer-boot.json index e6cafd128..ad8b68481 100644 --- a/test/data/manifests/rhel_8-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_8-aarch64-edge_simplified_installer-boot.json @@ -31,7 +31,6 @@ } } }, - "no-image-info": true, "manifest": { "version": "2", "pipelines": [ @@ -1005,7 +1004,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -12722,5 +12721,6 @@ "checksum": "sha256:340b3c65becfca3d39f2afeed9659505a33ee870270c4d115d9fefe8929ff806" } ] - } + }, + "no-image-info": true } diff --git a/test/data/manifests/rhel_8-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_8-x86_64-edge_raw_image-boot.json index 73cda415d..7baafd6c6 100644 --- a/test/data/manifests/rhel_8-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_8-x86_64-edge_raw_image-boot.json @@ -1002,7 +1002,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -8022,5 +8022,6 @@ "checksum": "sha256:340b3c65becfca3d39f2afeed9659505a33ee870270c4d115d9fefe8929ff806" } ] - } + }, + "no-image-info": true } diff --git a/test/data/manifests/rhel_8-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_8-x86_64-edge_simplified_installer-boot.json index 92e180c6c..986256397 100644 --- a/test/data/manifests/rhel_8-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_8-x86_64-edge_simplified_installer-boot.json @@ -31,7 +31,6 @@ } } }, - "no-image-info": true, "manifest": { "version": "2", "pipelines": [ @@ -1029,7 +1028,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -12952,5 +12951,6 @@ "checksum": "sha256:340b3c65becfca3d39f2afeed9659505a33ee870270c4d115d9fefe8929ff806" } ] - } + }, + "no-image-info": true } diff --git a/test/data/manifests/rhel_86-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_86-aarch64-edge_raw_image-boot.json index 3dad8dc2b..f1874403c 100644 --- a/test/data/manifests/rhel_86-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_86-aarch64-edge_raw_image-boot.json @@ -984,7 +984,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -7905,5 +7905,6 @@ "checksum": "sha256:340b3c65becfca3d39f2afeed9659505a33ee870270c4d115d9fefe8929ff806" } ] - } + }, + "no-image-info": true } diff --git a/test/data/manifests/rhel_86-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_86-aarch64-edge_simplified_installer-boot.json index 097f12bf4..b09fcb9a0 100644 --- a/test/data/manifests/rhel_86-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_86-aarch64-edge_simplified_installer-boot.json @@ -31,7 +31,6 @@ } } }, - "no-image-info": true, "manifest": { "version": "2", "pipelines": [ @@ -1005,7 +1004,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -12722,5 +12721,6 @@ "checksum": "sha256:340b3c65becfca3d39f2afeed9659505a33ee870270c4d115d9fefe8929ff806" } ] - } + }, + "no-image-info": true } diff --git a/test/data/manifests/rhel_86-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_86-x86_64-edge_raw_image-boot.json index 1cf4dad52..8fde9ec32 100644 --- a/test/data/manifests/rhel_86-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_86-x86_64-edge_raw_image-boot.json @@ -1002,7 +1002,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -8022,5 +8022,6 @@ "checksum": "sha256:340b3c65becfca3d39f2afeed9659505a33ee870270c4d115d9fefe8929ff806" } ] - } + }, + "no-image-info": true } diff --git a/test/data/manifests/rhel_86-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_86-x86_64-edge_simplified_installer-boot.json index 5d9bc7323..a3bf3985d 100644 --- a/test/data/manifests/rhel_86-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_86-x86_64-edge_simplified_installer-boot.json @@ -31,7 +31,6 @@ } } }, - "no-image-info": true, "manifest": { "version": "2", "pipelines": [ @@ -1029,7 +1028,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -12952,5 +12951,6 @@ "checksum": "sha256:340b3c65becfca3d39f2afeed9659505a33ee870270c4d115d9fefe8929ff806" } ] - } + }, + "no-image-info": true } diff --git a/test/data/manifests/rhel_87-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_87-aarch64-edge_raw_image-boot.json index c875436f2..4967ffc2d 100644 --- a/test/data/manifests/rhel_87-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_87-aarch64-edge_raw_image-boot.json @@ -981,7 +981,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -7890,5 +7890,6 @@ "checksum": "sha256:340b3c65becfca3d39f2afeed9659505a33ee870270c4d115d9fefe8929ff806" } ] - } + }, + "no-image-info": true } diff --git a/test/data/manifests/rhel_87-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_87-aarch64-edge_simplified_installer-boot.json index e0d262d3e..fd7beb047 100644 --- a/test/data/manifests/rhel_87-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_87-aarch64-edge_simplified_installer-boot.json @@ -31,7 +31,6 @@ } } }, - "no-image-info": true, "manifest": { "version": "2", "pipelines": [ @@ -1002,7 +1001,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -12695,5 +12694,6 @@ "checksum": "sha256:340b3c65becfca3d39f2afeed9659505a33ee870270c4d115d9fefe8929ff806" } ] - } + }, + "no-image-info": true } diff --git a/test/data/manifests/rhel_87-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_87-x86_64-edge_raw_image-boot.json index 973bfc9de..2bd5fcfa7 100644 --- a/test/data/manifests/rhel_87-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_87-x86_64-edge_raw_image-boot.json @@ -999,7 +999,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -8007,5 +8007,6 @@ "checksum": "sha256:340b3c65becfca3d39f2afeed9659505a33ee870270c4d115d9fefe8929ff806" } ] - } + }, + "no-image-info": true } diff --git a/test/data/manifests/rhel_87-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_87-x86_64-edge_simplified_installer-boot.json index 8be8c8aa3..93fc4681a 100644 --- a/test/data/manifests/rhel_87-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_87-x86_64-edge_simplified_installer-boot.json @@ -31,7 +31,6 @@ } } }, - "no-image-info": true, "manifest": { "version": "2", "pipelines": [ @@ -1026,7 +1025,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -12925,5 +12924,6 @@ "checksum": "sha256:340b3c65becfca3d39f2afeed9659505a33ee870270c4d115d9fefe8929ff806" } ] - } + }, + "no-image-info": true } diff --git a/test/data/manifests/rhel_90-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_90-aarch64-edge_raw_image-boot.json index db12edd14..70f4431c9 100644 --- a/test/data/manifests/rhel_90-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_90-aarch64-edge_raw_image-boot.json @@ -951,7 +951,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -6714,5 +6714,6 @@ "checksum": "sha256:d8e32be18055e46f26dece63f46d45738405618bf8b03c976c876c0c2cf2e4ed" } ] - } + }, + "no-image-info": true } diff --git a/test/data/manifests/rhel_90-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_90-aarch64-edge_simplified_installer-boot.json index 7c3b228d2..88755d7a9 100644 --- a/test/data/manifests/rhel_90-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_90-aarch64-edge_simplified_installer-boot.json @@ -31,7 +31,6 @@ } } }, - "no-image-info": true, "manifest": { "version": "2", "pipelines": [ @@ -975,7 +974,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -11513,5 +11512,6 @@ "checksum": "sha256:d8e32be18055e46f26dece63f46d45738405618bf8b03c976c876c0c2cf2e4ed" } ] - } + }, + "no-image-info": true } diff --git a/test/data/manifests/rhel_90-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_90-x86_64-edge_raw_image-boot.json index 5f23d824e..5b83ce291 100644 --- a/test/data/manifests/rhel_90-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_90-x86_64-edge_raw_image-boot.json @@ -972,7 +972,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -6846,5 +6846,6 @@ "checksum": "sha256:5ce0b29210f80ae4f1e44f0ca9ef44b806f1268ce3309c43a5f1fcda005c3344" } ] - } + }, + "no-image-info": true } diff --git a/test/data/manifests/rhel_90-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_90-x86_64-edge_simplified_installer-boot.json index 36c15508a..968245728 100644 --- a/test/data/manifests/rhel_90-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_90-x86_64-edge_simplified_installer-boot.json @@ -31,7 +31,6 @@ } } }, - "no-image-info": true, "manifest": { "version": "2", "pipelines": [ @@ -996,7 +995,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -11724,5 +11723,6 @@ "checksum": "sha256:5ce0b29210f80ae4f1e44f0ca9ef44b806f1268ce3309c43a5f1fcda005c3344" } ] - } + }, + "no-image-info": true } diff --git a/test/data/manifests/rhel_91-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_91-aarch64-edge_raw_image-boot.json index 061958906..16f3ea165 100644 --- a/test/data/manifests/rhel_91-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_91-aarch64-edge_raw_image-boot.json @@ -2370,7 +2370,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -8931,5 +8931,6 @@ "check_gpg": true } ] - } + }, + "no-image-info": true } diff --git a/test/data/manifests/rhel_91-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_91-aarch64-edge_simplified_installer-boot.json index 8888b8864..7060c8008 100644 --- a/test/data/manifests/rhel_91-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_91-aarch64-edge_simplified_installer-boot.json @@ -33,7 +33,6 @@ } } }, - "no-image-info": true, "manifest": { "version": "2", "pipelines": [ @@ -2419,7 +2418,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -15911,5 +15910,6 @@ "check_gpg": true } ] - } + }, + "no-image-info": true } diff --git a/test/data/manifests/rhel_91-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_91-x86_64-edge_raw_image-boot.json index 913887daf..9eb344a6f 100644 --- a/test/data/manifests/rhel_91-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_91-x86_64-edge_raw_image-boot.json @@ -2426,7 +2426,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -9105,5 +9105,6 @@ "check_gpg": true } ] - } + }, + "no-image-info": true } diff --git a/test/data/manifests/rhel_91-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_91-x86_64-edge_simplified_installer-boot.json index ff408513a..63524bd7e 100644 --- a/test/data/manifests/rhel_91-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_91-x86_64-edge_simplified_installer-boot.json @@ -33,7 +33,6 @@ } } }, - "no-image-info": true, "manifest": { "version": "2", "pipelines": [ @@ -2475,7 +2474,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": true, + "readonly": false, "bootloader": "none" } } @@ -16200,5 +16199,6 @@ "check_gpg": true } ] - } + }, + "no-image-info": true }