Skip to content

Commit db28616

Browse files
liulis-sgliulis-sg
authored
Added dv image json files to support xe (#810)
Added dv image json files to support xe kernel cmdline Signed-off-by: liulis <lishan.liu@intel.com>
1 parent c22bfd4 commit db28616

File tree

2 files changed

+266
-0
lines changed

2 files changed

+266
-0
lines changed

‎toolkit/imageconfigs/edge-image-desktop-virtualization-xe-dev.json‎

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
{
2+
"Disks": [
3+
{
4+
"PartitionTableType": "gpt",
5+
"MaxSize": 13312,
6+
"Artifacts": [
7+
{
8+
"Name": "edge-readonly-dv-xe-dev",
9+
"Type": "raw"
10+
},
11+
{
12+
"Name": "edge-readonly-dv-xe-dev",
13+
"Type": "vhd"
14+
}
15+
],
16+
"Partitions": [
17+
{
18+
"Name": "esp",
19+
"ID": "boot",
20+
"Flags": [
21+
"esp",
22+
"boot"
23+
],
24+
"Start": 1,
25+
"End": 300,
26+
"FsType": "fat32",
27+
"Type": "esp"
28+
},
29+
{
30+
"Name": "rootfs",
31+
"ID": "rootfs",
32+
"Start": 300,
33+
"End": 4048,
34+
"FsType": "ext4",
35+
"Type": "linux-root-amd64"
36+
},
37+
{
38+
"Name": "edge_persistent",
39+
"ID": "opt",
40+
"Start": 4048,
41+
"End": 0,
42+
"FsType": "ext4"
43+
}
44+
]
45+
}
46+
],
47+
"SystemConfigs": [
48+
{
49+
"Name": "Standard",
50+
"BootType": "efi",
51+
"PartitionSettings": [
52+
{
53+
"ID": "boot",
54+
"MountPoint": "/boot/efi",
55+
"MountOptions" : "umask=0077"
56+
},
57+
{
58+
"ID": "rootfs",
59+
"MountPoint": "/"
60+
},
61+
{
62+
"ID": "opt",
63+
"MountPoint": "/opt"
64+
}
65+
],
66+
"PackageLists": [
67+
"packagelists/docker.json",
68+
"packagelists/core-packages-image-systemd-boot.json",
69+
"packagelists/core-tools-packages.json",
70+
"packagelists/ssh-server.json",
71+
"packagelists/virtualization-host-full-packages.json",
72+
"packagelists/qemu-guest-packages.json",
73+
"packagelists/xorg-x11-packages.json",
74+
"packagelists/agents-packages.json",
75+
"packagelists/tools-tinker.json",
76+
"packagelists/persistent-mount-package.json",
77+
"packagelists/selinux-full.json",
78+
"packagelists/intel-gpu-base.json",
79+
"packagelists/intel-wireless.json",
80+
"packagelists/os-ab-update.json",
81+
"packagelists/fs-tools.json",
82+
"packagelists/helm.json",
83+
"packagelists/intel-idv-services.json"
84+
],
85+
"Packages": [
86+
"igt-gpu-tools"
87+
],
88+
"AdditionalFiles": {
89+
"additionalconfigs/layout.env": "/etc/layout.env",
90+
"additionalconfigs/99-dhcp-en.network": "/etc/systemd/network/99-dhcp-en.network",
91+
"additionalconfigs/systemd-networkd-wait-online-override.conf": "/etc/systemd/system/systemd-networkd-wait-online.service.d/override.conf",
92+
"additionalconfigs/emt-cloud-init.cfg": "/etc/cloud/cloud.cfg"
93+
},
94+
"PostInstallScripts": [
95+
{
96+
"Path": "additionalconfigs/configure-systemd-networkd-client-identifier.sh"
97+
},
98+
{
99+
"Path": "additionalconfigs/add-sudoer.sh"
100+
},
101+
{
102+
"Path": "additionalconfigs/add-docker-group.sh"
103+
}
104+
],
105+
"KernelOptions": {
106+
"default": "kernel"
107+
},
108+
"FinalizeImageScripts": [
109+
{
110+
"Path": "scripts/setup_emt_image.sh"
111+
},
112+
{
113+
"Path": "scripts/cleanup.sh"
114+
}
115+
],
116+
"KernelCommandLine": {
117+
"ExtraCommandLine": "quiet splash sysctl.vm.overcommit_memory=1 sysctl.kernel.panic=10 sysctl.kernel.panic_on_oops=1 sysctl.fs.inotify.max_user_instances=8192 rd.shell=0 rd.timeout=200 rd.emergency=reboot udmabuf.list_limit=8192 xe.force_probe=* xe.max_vfs=7",
118+
"SELinux": "permissive"
119+
},
120+
"Hostname": "EdgeMicrovisorToolkit",
121+
"DisableRpmDocs": true,
122+
"OverrideRpmLocales": "NONE",
123+
"EfiProvider": "systemd-boot",
124+
"ImmutabilityEnabled": false,
125+
"Users": [
126+
{
127+
"Name": "root",
128+
"Password": "$6$h06k1YSGP1nz$TVrHZZQS/rf2xo3.gb80GJKkkUzaylHPz/Ofvl/L5seczLeM98man/0zZoY4m.OEuvE2znG2jo909xvIv3FrL1",
129+
"PasswordHashed": true
130+
},
131+
{
132+
"Name": "guest",
133+
"Password": "$6$6HeEWrlUMlCT$c.NyEBGjE/iVx91gK0Rj83L9K5/HIn.d8MC3c781GRVPd/ZvDFVkIuP8aGZWxyvNDmqdEHjGuUhBC/zZOyAgI0",
134+
"PasswordHashed": true
135+
}
136+
]
137+
138+
}
139+
]
140+
}

‎toolkit/imageconfigs/edge-image-desktop-virtualization-xe.json‎

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
{
2+
"Disks": [
3+
{
4+
"PartitionTableType": "gpt",
5+
"MaxSize": 13312,
6+
"Artifacts": [
7+
{
8+
"Name": "edge-readonly-dv-xe",
9+
"Type": "raw"
10+
},
11+
{
12+
"Name": "edge-readonly-dv-xe",
13+
"Type": "vhd"
14+
}
15+
],
16+
"Partitions": [
17+
{
18+
"Name": "esp",
19+
"ID": "boot",
20+
"Flags": [
21+
"esp",
22+
"boot"
23+
],
24+
"Start": 1,
25+
"End": 300,
26+
"FsType": "fat32",
27+
"Type": "esp"
28+
},
29+
{
30+
"Name": "rootfs",
31+
"ID": "rootfs",
32+
"Start": 300,
33+
"End": 4048,
34+
"FsType": "ext4",
35+
"Type": "linux-root-amd64"
36+
},
37+
{
38+
"Name": "edge_persistent",
39+
"ID": "opt",
40+
"Start": 4048,
41+
"End": 0,
42+
"FsType": "ext4"
43+
}
44+
]
45+
}
46+
],
47+
"SystemConfigs": [
48+
{
49+
"Name": "Standard",
50+
"BootType": "efi",
51+
"PartitionSettings": [
52+
{
53+
"ID": "boot",
54+
"MountPoint": "/boot/efi",
55+
"MountOptions" : "umask=0077"
56+
},
57+
{
58+
"ID": "rootfs",
59+
"MountPoint": "/"
60+
},
61+
{
62+
"ID": "opt",
63+
"MountPoint": "/opt"
64+
}
65+
],
66+
"PackageLists": [
67+
"packagelists/docker.json",
68+
"packagelists/core-packages-image-systemd-boot.json",
69+
"packagelists/core-tools-packages.json",
70+
"packagelists/ssh-server.json",
71+
"packagelists/virtualization-host-full-packages.json",
72+
"packagelists/qemu-guest-packages.json",
73+
"packagelists/xorg-x11-packages.json",
74+
"packagelists/agents-packages.json",
75+
"packagelists/tools-tinker.json",
76+
"packagelists/persistent-mount-package.json",
77+
"packagelists/fde-verity-package.json",
78+
"packagelists/selinux-full.json",
79+
"packagelists/intel-gpu-base.json",
80+
"packagelists/intel-wireless.json",
81+
"packagelists/os-ab-update.json",
82+
"packagelists/helm.json",
83+
"packagelists/fs-tools.json",
84+
"packagelists/intel-idv-services.json"
85+
],
86+
"Packages": [
87+
"igt-gpu-tools"
88+
],
89+
"AdditionalFiles": {
90+
"additionalconfigs/layout.env": "/etc/layout.env",
91+
"additionalconfigs/99-dhcp-en.network": "/etc/systemd/network/99-dhcp-en.network",
92+
"additionalconfigs/systemd-networkd-wait-online-override.conf": "/etc/systemd/system/systemd-networkd-wait-online.service.d/override.conf",
93+
"additionalconfigs/emt-cloud-init.cfg": "/etc/cloud/cloud.cfg"
94+
},
95+
"PostInstallScripts": [
96+
{
97+
"Path": "additionalconfigs/configure-systemd-networkd-client-identifier.sh"
98+
},
99+
{
100+
"Path": "additionalconfigs/add-sudoer.sh"
101+
}
102+
],
103+
"KernelOptions": {
104+
"default": "kernel"
105+
},
106+
"FinalizeImageScripts": [
107+
{
108+
"Path": "scripts/setup_emt_image.sh"
109+
},
110+
{
111+
"Path": "scripts/cleanup.sh"
112+
}
113+
],
114+
"KernelCommandLine": {
115+
"ExtraCommandLine": "quiet splash sysctl.vm.overcommit_memory=1 sysctl.kernel.panic=10 sysctl.kernel.panic_on_oops=1 sysctl.fs.inotify.max_user_instances=8192 rd.shell=0 rd.timeout=200 rd.emergency=reboot udmabuf.list_limit=8192 xe.force_probe=* xe.max_vfs=7",
116+
"SELinux": "permissive"
117+
},
118+
"Hostname": "EdgeMicrovisorToolkit",
119+
"DisableRpmDocs": true,
120+
"OverrideRpmLocales": "NONE",
121+
"EfiProvider": "systemd-boot",
122+
"ImmutabilityEnabled": true,
123+
"EMTEncryptionEnabled": true
124+
}
125+
]
126+
}

0 commit comments

Comments
 (0)