Skip to content

Commit 6ea5b87

Browse files
yockgenyockgen
authored
Merge branch 'main' into earthfile-deb-package
2 parents fe49b04 + 4247af8 commit 6ea5b87

36 files changed

Lines changed: 535 additions & 159 deletions

File tree

‎config/osv/azure-linux/azl3/imageconfigs/additionalfiles/getty@.service‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[Service]
2+
ExecStart=
3+
ExecStart=-/sbin/agetty --noclear --autologin root --keep-baud %I $TERM
4+
5+
# Default to tty1 but allow other choices
6+
[Install]
7+
Alias=getty.target.wants/getty@tty1.service

‎config/osv/azure-linux/azl3/imageconfigs/additionalfiles/serial-getty@.service‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[Service]
2+
ExecStart=
3+
ExecStart=-/sbin/agetty --noclear --autologin root --keep-baud %I $TERM
4+
5+
# Default to ttyS0 but allow other choices
6+
[Install]
7+
Alias=getty.target.wants/serial-getty@ttyS0.service

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,15 @@ systemConfig:
8888
additionalFiles:
8989
- local: ../additionalfiles/99-dhcp-en.network
9090
final: /etc/systemd/network/99-dhcp-en.network
91+
- local: ../additionalfiles/getty@.service
92+
final: /usr/lib/systemd/system/getty@.service
93+
- local: ../additionalfiles/serial-getty@.service
94+
final: /usr/lib/systemd/system/serial-getty@.service
95+
96+
users:
97+
- name: root
98+
passwordMaxAge: 99999
99+
password: ""
91100

92101
kernel:
93102
name: kernel

‎config/osv/edge-microvisor-toolkit/emt3/imageconfigs/additionalfiles/getty@.service‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[Service]
2+
ExecStart=
3+
ExecStart=-/sbin/agetty --noclear --autologin root --keep-baud %I $TERM
4+
5+
# Default to tty1 but allow other choices
6+
[Install]
7+
Alias=getty.target.wants/getty@tty1.service

‎config/osv/edge-microvisor-toolkit/emt3/imageconfigs/additionalfiles/serial-getty@.service‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[Service]
2+
ExecStart=
3+
ExecStart=-/sbin/agetty --noclear --autologin root --keep-baud %I $TERM
4+
5+
# Default to ttyS0 but allow other choices
6+
[Install]
7+
Alias=getty.target.wants/serial-getty@ttyS0.service

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,15 @@ systemConfig:
8888
additionalFiles:
8989
- local: ../additionalfiles/99-dhcp-en.network
9090
final: /etc/systemd/network/99-dhcp-en.network
91+
- local: ../additionalfiles/getty@.service
92+
final: /usr/lib/systemd/system/getty@.service
93+
- local: ../additionalfiles/serial-getty@.service
94+
final: /usr/lib/systemd/system/serial-getty@.service
95+
96+
users:
97+
- name: root
98+
passwordMaxAge: 99999
99+
password: ""
91100

92101
kernel:
93102
name: kernel

‎config/osv/wind-river-elxr/elxr12/imageconfigs/additionalfiles/getty@.service‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[Service]
2+
ExecStart=
3+
ExecStart=-/sbin/agetty --noclear --autologin root --keep-baud %I $TERM
4+
5+
# Default to tty1 but allow other choices
6+
[Install]
7+
Alias=getty.target.wants/getty@tty1.service

‎config/osv/wind-river-elxr/elxr12/imageconfigs/additionalfiles/serial-getty@.service‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[Service]
2+
ExecStart=
3+
ExecStart=-/sbin/agetty --noclear --autologin root --keep-baud %I $TERM
4+
5+
# Default to ttyS0 but allow other choices
6+
[Install]
7+
Alias=getty.target.wants/serial-getty@ttyS0.service

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,15 @@ systemConfig:
4444
final: /etc/systemd/network/dhcp.network
4545
- local: ../additionalfiles/elxr-aria.list
4646
final: /etc/apt/sources.list.d/elxr-aria.list
47+
- local: ../additionalfiles/getty@.service
48+
final: /usr/lib/systemd/system/getty@.service
49+
- local: ../additionalfiles/serial-getty@.service
50+
final: /usr/lib/systemd/system/serial-getty@.service
51+
52+
users:
53+
- name: root
54+
passwordMaxAge: 99999
55+
password: ""
4756

4857
kernel:
4958
name: kernel

‎internal/chroot/chrootbuild/chrootbuild.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ func (chrootBuilder *ChrootBuilder) BuildChrootEnv(targetOs string, targetDist s
313313

314314
log.Infof("Chroot environment build completed successfully")
315315

316-
if _, err = shell.ExecCmd("rm -rf "+chrootEnvPath, true, "", nil); err != nil {
316+
if _, err = shell.ExecCmd("rm -rf "+chrootEnvPath, true, shell.HostPath, nil); err != nil {
317317
log.Errorf("Failed to remove chroot environment build path: %v", err)
318318
return fmt.Errorf("failed to remove chroot environment build path: %w", err)
319319
}

0 commit comments

Comments
 (0)