Skip to content

Commit 1b1154d

Browse files
authored
Create marketplace images for 6.12 kernels (microsoft#14838)
Introduction of two new image jsons which use kernel-hwe. These follow the current marketplace image jsons with the addition of the 6.12 kernel-hwe kernel. toolkit/imageconfigs/marketplace-gen2-aarch64-kernel-hwe.json toolkit/imageconfigs/marketplace-gen2-kernel-hwe.json
1 parent 02f28a4 commit 1b1154d

File tree

2 files changed

+168
-0
lines changed

2 files changed

+168
-0
lines changed
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
{
2+
"Disks": [
3+
{
4+
"PartitionTableType": "gpt",
5+
"MaxSize": 5000,
6+
"Artifacts": [
7+
{
8+
"Name": "cblmariner-arm64-gen2-kernel-hwe",
9+
"Type": "vhd"
10+
}
11+
],
12+
"Partitions": [
13+
{
14+
"ID": "efi",
15+
"Flags": [
16+
"esp",
17+
"boot"
18+
],
19+
"Start": 1,
20+
"End": 65,
21+
"FsType": "fat32"
22+
},
23+
{
24+
"ID": "boot",
25+
"Start": 65,
26+
"End": 565,
27+
"FsType": "ext4"
28+
},
29+
{
30+
"ID": "rootfs",
31+
"Name": "rootfs",
32+
"Start": 565,
33+
"End": 0,
34+
"FsType": "ext4"
35+
}
36+
]
37+
}
38+
],
39+
"SystemConfigs": [
40+
{
41+
"Name": "Standard",
42+
"BootType": "efi",
43+
"PartitionSettings": [
44+
{
45+
"ID": "efi",
46+
"MountPoint": "/boot/efi",
47+
"MountOptions" : "umask=0077"
48+
},
49+
{
50+
"ID": "boot",
51+
"MountPoint": "/boot"
52+
},
53+
{
54+
"ID": "rootfs",
55+
"MountPoint": "/"
56+
}
57+
],
58+
"PackageLists": [
59+
"packagelists/core-packages-image-aarch64.json",
60+
"packagelists/marketplace-tools-packages.json",
61+
"packagelists/azurevm-packages.json",
62+
"packagelists/hyperv-packages.json"
63+
],
64+
"AdditionalFiles": {
65+
"additionalconfigs/cloud-init.cfg": "/etc/cloud/cloud.cfg",
66+
"additionalconfigs/chrony.cfg": "/etc/chrony.conf",
67+
"additionalconfigs/wait-for-ptp-hyperv.conf": "/etc/systemd/system/chronyd.service.d/wait-for-ptp-hyperv.conf",
68+
"additionalconfigs/51-ptp-hyperv.rules": "/etc/udev/rules.d/51-ptp-hyperv.rules"
69+
},
70+
"PostInstallScripts": [
71+
{
72+
"Path": "additionalconfigs/configure-systemd-networkd.sh"
73+
}
74+
],
75+
"KernelOptions": {
76+
"default": "kernel-hwe"
77+
},
78+
"KernelCommandLine": {
79+
"ExtraCommandLine": "console=tty1 console=ttyAMA0 earlycon=pl011,0xeffec000 initcall_blacklist=arm_pmu_acpi_init"
80+
},
81+
"Hostname": "azurelinux"
82+
}
83+
]
84+
}
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
{
2+
"Disks": [
3+
{
4+
"PartitionTableType": "gpt",
5+
"MaxSize": 5000,
6+
"Artifacts": [
7+
{
8+
"Name": "cblmariner-gen2-kernel-hwe",
9+
"Type": "vhd"
10+
}
11+
],
12+
"Partitions": [
13+
{
14+
"ID": "efi",
15+
"Flags": [
16+
"esp",
17+
"boot"
18+
],
19+
"Start": 1,
20+
"End": 65,
21+
"FsType": "fat32"
22+
},
23+
{
24+
"ID": "boot",
25+
"Start": 65,
26+
"End": 565,
27+
"FsType": "ext4"
28+
},
29+
{
30+
"ID": "rootfs",
31+
"Name": "rootfs",
32+
"Start": 565,
33+
"End": 0,
34+
"FsType": "ext4"
35+
}
36+
]
37+
}
38+
],
39+
"SystemConfigs": [
40+
{
41+
"Name": "Standard",
42+
"BootType": "efi",
43+
"PartitionSettings": [
44+
{
45+
"ID": "efi",
46+
"MountPoint": "/boot/efi",
47+
"MountOptions" : "umask=0077"
48+
},
49+
{
50+
"ID": "boot",
51+
"MountPoint": "/boot"
52+
},
53+
{
54+
"ID": "rootfs",
55+
"MountPoint": "/"
56+
}
57+
],
58+
"PackageLists": [
59+
"packagelists/core-packages-image.json",
60+
"packagelists/marketplace-tools-packages.json",
61+
"packagelists/azurevm-packages.json",
62+
"packagelists/hyperv-packages.json"
63+
],
64+
"AdditionalFiles": {
65+
"additionalconfigs/cloud-init.cfg": "/etc/cloud/cloud.cfg",
66+
"additionalconfigs/chrony.cfg": "/etc/chrony.conf",
67+
"additionalconfigs/wait-for-ptp-hyperv.conf": "/etc/systemd/system/chronyd.service.d/wait-for-ptp-hyperv.conf",
68+
"additionalconfigs/51-ptp-hyperv.rules": "/etc/udev/rules.d/51-ptp-hyperv.rules"
69+
},
70+
"PostInstallScripts": [
71+
{
72+
"Path": "additionalconfigs/configure-systemd-networkd.sh"
73+
}
74+
],
75+
"KernelOptions": {
76+
"default": "kernel-hwe"
77+
},
78+
"KernelCommandLine": {
79+
"ExtraCommandLine": "console=ttyS0"
80+
},
81+
"Hostname": "azurelinux"
82+
}
83+
]
84+
}

0 commit comments

Comments
 (0)