particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

qcow2: remove partition_table_id

Browse source 
It's not necessary to specify it.
This commit is contained in:
Lars Karlitski 2019-07-29 09:46:47 +02:00 • committed by Tom Gundersen
parent 593c6de385
commit 2e0981f1ab
5 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
assemblers/org.osbuild.qcow2
View file

@ -61,7 +61,7 @@ def main(tree, output_dir, options, loop_client):
subprocess.run(["truncate", "--size", str(size), image], check=True)
# Set up the partition table of the image
partition_table = "label: mbr\nlabel-id: {partition_table_id}\nbootable, type=83"
partition_table = "label: mbr\nbootable, type=83"
subprocess.run(["sfdisk", "-q", image], input=partition_table, encoding='utf-8', check=True)
r = subprocess.run(["sfdisk", "--json", image], stdout=subprocess.PIPE, encoding='utf-8', check=True)
partition_table = json.loads(r.stdout)

3
samples/base-qcow2.json
View file

@ -6,8 +6,7 @@
"name": "org.osbuild.qcow2",
"options": {
"filename": "base.qcow2",
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"partition_table_id": "0xdeadbeef"
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac"
}
}
}

3
test/2-configure-web-server.json
View file

@ -29,8 +29,7 @@
{
"name": "org.osbuild.grub2",
"options": {
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"partition_table_id": "0xdeadbeef"
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac"
}
}
]

3
test/3-compose-qcow2.json
View file

@ -5,8 +5,7 @@
"name": "org.osbuild.qcow2",
"options": {
"filename": "base.qcow2",
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"partition_table_id": "0xdeadbeef"
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac"
}
}
}

6
test/4-all.json
View file

@ -46,8 +46,7 @@
{
"name": "org.osbuild.grub2",
"options": {
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"partition_table_id": "0xdeadbeef"
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac"
}
}
],
@ -55,8 +54,7 @@
"name": "org.osbuild.qcow2",
"options": {
"filename": "base.qcow2",
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"partition_table_id": "0xdeadbeef"
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac"
}
}
}