|
 |
51aca5 |
From 7c635fc6b0a45e1d54bea9caaaf4ba82447cfe3f Mon Sep 17 00:00:00 2001
|
|
|
51aca5 |
From: Tom Gundersen <teg@jklm.no>
|
|
|
51aca5 |
Date: Sun, 29 Aug 2021 14:59:24 +0000
|
|
|
51aca5 |
Subject: [PATCH] test/rhel85/qcow2/custom: regenerate
|
|
|
51aca5 |
|
|
|
51aca5 |
Signed-off-by: Tom Gundersen <teg@jklm.no>
|
|
|
51aca5 |
---
|
|
|
51aca5 |
.../rhel_85-x86_64-qcow2-customize.json | 64 +++++++++++--------
|
|
|
51aca5 |
1 file changed, 39 insertions(+), 25 deletions(-)
|
|
|
51aca5 |
|
|
|
51aca5 |
diff --git a/test/data/manifests/rhel_85-x86_64-qcow2-customize.json b/test/data/manifests/rhel_85-x86_64-qcow2-customize.json
|
|
|
51aca5 |
index 18524628..c1e1632a 100644
|
|
|
51aca5 |
--- a/test/data/manifests/rhel_85-x86_64-qcow2-customize.json
|
|
|
51aca5 |
+++ b/test/data/manifests/rhel_85-x86_64-qcow2-customize.json
|
|
|
51aca5 |
@@ -100,17 +100,17 @@
|
|
|
51aca5 |
]
|
|
|
51aca5 |
},
|
|
|
51aca5 |
"filesystem": [
|
|
|
51aca5 |
- {
|
|
|
51aca5 |
- "mountpoint": "/",
|
|
|
51aca5 |
- "minsize": 131072000
|
|
|
51aca5 |
- },
|
|
|
51aca5 |
{
|
|
|
51aca5 |
"mountpoint": "/usr",
|
|
|
51aca5 |
"minsize": 2147483648
|
|
|
51aca5 |
},
|
|
|
51aca5 |
{
|
|
|
51aca5 |
"mountpoint": "/var",
|
|
|
51aca5 |
- "minsize": 131072000
|
|
|
51aca5 |
+ "minsize": 1073741824
|
|
|
51aca5 |
+ },
|
|
|
51aca5 |
+ {
|
|
|
51aca5 |
+ "mountpoint": "/",
|
|
|
51aca5 |
+ "minsize": 2147483648
|
|
|
51aca5 |
}
|
|
|
51aca5 |
]
|
|
|
51aca5 |
}
|
|
|
51aca5 |
@@ -477,6 +477,7 @@
|
|
|
51aca5 |
"sha256:53849d779914a944acc126459911030c8ac8310ffcab354c6a7bcc4ef4af5bab",
|
|
|
51aca5 |
"sha256:39f86feba904fc4c4a9a04a54576d6d3b4e9af344155aee9e4321c27b4742f0a",
|
|
|
51aca5 |
"sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb",
|
|
|
51aca5 |
+ "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d",
|
|
|
51aca5 |
"sha256:ee5595a39aa681b5d91f25d5e9415733ac47e92840af4baaaf6d2f802c78f212",
|
|
|
51aca5 |
"sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78",
|
|
|
51aca5 |
"sha256:1291973fb1c479d3d3dab62d7dbcda052ab998779a0eb2e45427d0e2257d8db4",
|
|
|
51aca5 |
@@ -1451,8 +1452,8 @@
|
|
|
51aca5 |
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
|
|
|
51aca5 |
},
|
|
|
51aca5 |
{
|
|
|
51aca5 |
- "size": 16312220,
|
|
|
51aca5 |
- "start": 4659200,
|
|
|
51aca5 |
+ "size": 14471068,
|
|
|
51aca5 |
+ "start": 6500352,
|
|
|
51aca5 |
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
|
|
|
51aca5 |
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
|
|
|
51aca5 |
},
|
|
|
51aca5 |
@@ -1463,7 +1464,7 @@
|
|
|
51aca5 |
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"
|
|
|
51aca5 |
},
|
|
|
51aca5 |
{
|
|
|
51aca5 |
- "size": 256000,
|
|
|
51aca5 |
+ "size": 2097152,
|
|
|
51aca5 |
"start": 4403200,
|
|
|
51aca5 |
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
|
|
|
51aca5 |
"uuid": "a178892e-e285-4ce1-9114-55780875d64e"
|
|
|
51aca5 |
@@ -1506,8 +1507,8 @@
|
|
|
51aca5 |
"type": "org.osbuild.loopback",
|
|
|
51aca5 |
"options": {
|
|
|
51aca5 |
"filename": "disk.img",
|
|
|
51aca5 |
- "start": 4659200,
|
|
|
51aca5 |
- "size": 16312220
|
|
|
51aca5 |
+ "start": 6500352,
|
|
|
51aca5 |
+ "size": 14471068
|
|
|
51aca5 |
}
|
|
|
51aca5 |
}
|
|
|
51aca5 |
}
|
|
|
51aca5 |
@@ -1539,7 +1540,7 @@
|
|
|
51aca5 |
"options": {
|
|
|
51aca5 |
"filename": "disk.img",
|
|
|
51aca5 |
"start": 4403200,
|
|
|
51aca5 |
- "size": 256000
|
|
|
51aca5 |
+ "size": 2097152
|
|
|
51aca5 |
}
|
|
|
51aca5 |
}
|
|
|
51aca5 |
}
|
|
|
51aca5 |
@@ -1576,8 +1577,8 @@
|
|
|
51aca5 |
"type": "org.osbuild.loopback",
|
|
|
51aca5 |
"options": {
|
|
|
51aca5 |
"filename": "disk.img",
|
|
|
51aca5 |
- "start": 4659200,
|
|
|
51aca5 |
- "size": 16312220
|
|
|
51aca5 |
+ "start": 6500352,
|
|
|
51aca5 |
+ "size": 14471068
|
|
|
51aca5 |
}
|
|
|
51aca5 |
},
|
|
|
51aca5 |
"usr": {
|
|
|
51aca5 |
@@ -1593,7 +1594,7 @@
|
|
|
51aca5 |
"options": {
|
|
|
51aca5 |
"filename": "disk.img",
|
|
|
51aca5 |
"start": 4403200,
|
|
|
51aca5 |
- "size": 256000
|
|
|
51aca5 |
+ "size": 2097152
|
|
|
51aca5 |
}
|
|
|
51aca5 |
}
|
|
|
51aca5 |
},
|
|
|
51aca5 |
@@ -2921,6 +2922,9 @@
|
|
|
51aca5 |
"sha256:d50174632033170dfd1d8125f132962872c0042711e44ed59e91f6d2d26071c0": {
|
|
|
51aca5 |
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210730/Packages/polkit-libs-0.115-12.el8.x86_64.rpm"
|
|
|
51aca5 |
},
|
|
|
51aca5 |
+ "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d": {
|
|
|
51aca5 |
+ "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210730/Packages/efibootmgr-16-1.el8.x86_64.rpm"
|
|
|
51aca5 |
+ },
|
|
|
51aca5 |
"sha256:d570af0578f5b2c6225f1f2354404f65bccf91c3974e98dcbc0c7b55a61b9b46": {
|
|
|
51aca5 |
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210730/Packages/grep-3.1-6.el8.x86_64.rpm"
|
|
|
51aca5 |
},
|
|
|
51aca5 |
@@ -9354,6 +9358,15 @@
|
|
|
51aca5 |
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210730/Packages/efi-filesystem-3-3.el8.noarch.rpm",
|
|
|
51aca5 |
"checksum": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
|
|
|
51aca5 |
},
|
|
|
51aca5 |
+ {
|
|
|
51aca5 |
+ "name": "efibootmgr",
|
|
|
51aca5 |
+ "epoch": 0,
|
|
|
51aca5 |
+ "version": "16",
|
|
|
51aca5 |
+ "release": "1.el8",
|
|
|
51aca5 |
+ "arch": "x86_64",
|
|
|
51aca5 |
+ "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210730/Packages/efibootmgr-16-1.el8.x86_64.rpm",
|
|
|
51aca5 |
+ "checksum": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
|
|
|
51aca5 |
+ },
|
|
|
51aca5 |
{
|
|
|
51aca5 |
"name": "efivar",
|
|
|
51aca5 |
"epoch": 0,
|
|
|
51aca5 |
@@ -13168,6 +13181,7 @@
|
|
|
51aca5 |
"e2fsprogs-1.45.6-2.el8.x86_64",
|
|
|
51aca5 |
"e2fsprogs-libs-1.45.6-2.el8.x86_64",
|
|
|
51aca5 |
"efi-filesystem-3-3.el8.noarch",
|
|
|
51aca5 |
+ "efibootmgr-16-1.el8.x86_64",
|
|
|
51aca5 |
"efivar-37-4.el8.x86_64",
|
|
|
51aca5 |
"efivar-libs-37-4.el8.x86_64",
|
|
|
51aca5 |
"elfutils-debuginfod-client-0.185-1.el8.x86_64",
|
|
|
51aca5 |
@@ -13603,6 +13617,16 @@
|
|
|
51aca5 |
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
|
|
|
51aca5 |
"uuid": "7B77-95E7"
|
|
|
51aca5 |
},
|
|
|
51aca5 |
+ {
|
|
|
51aca5 |
+ "bootable": false,
|
|
|
51aca5 |
+ "fstype": "xfs",
|
|
|
51aca5 |
+ "label": "root",
|
|
|
51aca5 |
+ "partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
|
|
|
51aca5 |
+ "size": 7409186816,
|
|
|
51aca5 |
+ "start": 3328180224,
|
|
|
51aca5 |
+ "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
|
|
|
51aca5 |
+ "uuid": "e2d3d0d0-de6b-48f9-b44c-e85ff044c6b1"
|
|
|
51aca5 |
+ },
|
|
|
51aca5 |
{
|
|
|
51aca5 |
"bootable": false,
|
|
|
51aca5 |
"fstype": "xfs",
|
|
|
51aca5 |
@@ -13618,20 +13642,10 @@
|
|
|
51aca5 |
"fstype": "xfs",
|
|
|
51aca5 |
"label": null,
|
|
|
51aca5 |
"partuuid": "A178892E-E285-4CE1-9114-55780875D64E",
|
|
|
51aca5 |
- "size": 131072000,
|
|
|
51aca5 |
+ "size": 1073741824,
|
|
|
51aca5 |
"start": 2254438400,
|
|
|
51aca5 |
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
|
|
|
51aca5 |
"uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4"
|
|
|
51aca5 |
- },
|
|
|
51aca5 |
- {
|
|
|
51aca5 |
- "bootable": false,
|
|
|
51aca5 |
- "fstype": "xfs",
|
|
|
51aca5 |
- "label": "root",
|
|
|
51aca5 |
- "partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
|
|
|
51aca5 |
- "size": 8351856640,
|
|
|
51aca5 |
- "start": 2385510400,
|
|
|
51aca5 |
- "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
|
|
|
51aca5 |
- "uuid": "e2d3d0d0-de6b-48f9-b44c-e85ff044c6b1"
|
|
|
51aca5 |
}
|
|
|
51aca5 |
],
|
|
|
51aca5 |
"passwd": [
|
|
|
51aca5 |
--
|
|
|
51aca5 |
2.31.1
|
|
|
51aca5 |
|