Skip to content

Commit e2327db

Browse files
committed
feat: implement console-less dev images
1 parent 4c2495e commit e2327db

7 files changed

Lines changed: 23 additions & 5 deletions

File tree

mkosi.profiles/devtools/mkosi.extra/etc/systemd/system/serial-console.service renamed to mkosi.profiles/devtools/mkosi.extra/usr/lib/systemd/system/serial-console.service

File renamed without changes.

mkosi.profiles/devtools/mkosi.postinst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
#!/bin/bash
2+
23
set -euxo pipefail
34

5+
# Enable console service
6+
mkosi-chroot systemctl unmask serial-console.service
7+
mkosi-chroot systemctl add-wants minimal.target serial-console.service
8+
49
# Deterministically set root password
510
PASSWORD="dqSPjo4p"
611
HASH=$(mkosi-chroot openssl passwd -6 -salt salt "$PASSWORD")

modules/l2/_common_gcp/mkosi.conf

Lines changed: 0 additions & 5 deletions
This file was deleted.

modules/l2/_gcp/mkosi.conf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[Match]
2+
Profiles=gcp
3+
4+
[Content]
5+
ExtraTrees=modules/l2/_gcp/mkosi.extra

modules/l2/_common_gcp/mkosi.extra/etc/systemd/resolved.conf renamed to modules/l2/_gcp/mkosi.extra/etc/systemd/resolved.conf

File renamed without changes.

modules/l2/_no_console/mkosi.conf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[Match]
2+
Profiles=gcp
3+
4+
[Content]
5+
PostInstallationScripts=modules/l2/_no_console/mkosi.postinst
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/bash
2+
3+
set -euxo pipefail
4+
5+
# Disable console service
6+
7+
mkosi-chroot systemctl disable serial-console.service
8+
mkosi-chroot systemctl mask serial-console.service

0 commit comments

Comments
 (0)