Skip to content

Commit 7279929

Browse files
Merge pull request open-edge-platform#434 from open-edge-platform/ssh_imutable_issue_other
fix ssh issue in other os
2 parents 0b19757 + c02d58e commit 7279929

File tree

6 files changed

+34
-2
lines changed

6 files changed

+34
-2
lines changed

config/osv/azure-linux/azl3/imageconfigs/defaultconfigs/default-raw-x86_64.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ systemConfig:
8989
- dracut-virtio
9090
- dracut-xen
9191
- veritysetup
92+
- systemd-resolved
9293

9394
additionalFiles:
9495
- local: ../additionalfiles/99-dhcp-en.network
@@ -101,3 +102,8 @@ systemConfig:
101102
packages:
102103
- kernel
103104
uki: true
105+
106+
configurations:
107+
# Set up ssh directories with correct permissions
108+
- cmd: "mkdir -m 755 -p /opt/var/lib/sshd"
109+
- cmd: "printf 'd /run/sshd 0755 root root -\\n' > /etc/tmpfiles.d/sshd.conf"

config/osv/edge-microvisor-toolkit/emt3/imageconfigs/defaultconfigs/default-raw-x86_64.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ systemConfig:
136136
- moby-engine
137137
- docker-cli
138138
- docker-compose
139+
- systemd-resolved
139140

140141
additionalFiles:
141142
- local: ../additionalfiles/99-dhcp-en.network
@@ -151,3 +152,8 @@ systemConfig:
151152
uki: true
152153
packages:
153154
- kernel-drivers-gpu
155+
156+
configurations:
157+
# Set up ssh directories with correct permissions
158+
- cmd: "mkdir -m 755 -p /opt/var/lib/sshd"
159+
- cmd: "printf 'd /run/sshd 0755 root root -\\n' > /etc/tmpfiles.d/sshd.conf"

config/osv/redhat-compatible-distro/el10/imageconfigs/defaultconfigs/default-raw-x86_64.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ systemConfig:
104104
- shadow-utils
105105
- iproute
106106
- ncurses
107+
- systemd-resolved
107108

108109
additionalFiles:
109110
- local: ../additionalfiles/99-dhcp-en.network
@@ -116,3 +117,8 @@ systemConfig:
116117
packages:
117118
- kernel
118119
uki: true
120+
121+
configurations:
122+
# Set up ssh directories with correct permissions
123+
- cmd: "mkdir -m 755 -p /opt/var/lib/sshd"
124+
- cmd: "printf 'd /run/sshd 0755 root root -\\n' > /etc/tmpfiles.d/sshd.conf"

config/osv/wind-river-elxr/elxr12/imageconfigs/defaultconfigs/default-raw-x86_64.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ systemConfig:
8080
- dracut
8181
- systemd-boot
8282
- elxr-archive-keyring
83+
- systemd-timesyncd
8384

8485
additionalFiles:
8586
- local: ../additionalfiles/dhcp.network

image-templates/azl3-x86_64-edge-raw.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ systemConfig:
5151
description: Default yml configuration for edge image
5252

5353
immutability:
54-
enabled: false
54+
enabled: true
5555
# To enable Secure Boot, provide the actual file paths for your environment below and uncomment the relevant lines.
5656
# secureBootDBKey: "<SECURE_BOOT_DB_KEY_PATH>"
5757
# secureBootDBCrt: "<SECURE_BOOT_DB_CRT_PATH>"

image-templates/elxr12-x86_64-minimal-raw.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ target:
2323
arch: x86_64 # Target OS architecture
2424
imageType: raw # Image type, valid value: [raw, iso].
2525

26+
packageRepositories:
27+
- codename: "noble"
28+
url: "https://download.01.org/intel-linux-overlay/ubuntu/"
29+
pkey: "https://download.01.org/intel-linux-overlay/ubuntu/E6FA98203588250569758E97D176E3162086EE4C.gpg"
30+
component: "kernels"
31+
2632
disk:
2733
name: Minimal_Raw # 1:1 mapping to the systemConfigs name
2834
artifacts:
@@ -57,4 +63,11 @@ systemConfig:
5763
description: Default yml configuration for raw image
5864

5965
immutability:
60-
enabled: false # default is true, overridden to false here
66+
enabled: false # default is true, overridden to false here
67+
68+
kernel:
69+
version: "6.12"
70+
cmdline: "console=ttyS0,115200 console=tty0 loglevel=7 i915.force_probe=*"
71+
packages:
72+
- linux-image-6.12-intel
73+
- linux-headers-6.12-intel

0 commit comments

Comments
 (0)