Merge pull request #31 from jandubois/log-services-to-console

Gate docker.socket and tee unit output to the console

Author: jandubois

config.kiwi

@@ -19,7 +19,7 @@
   </preferences>
   <preferences profiles="lima">
     <type image="oem" format="qcow2" filesystem="ext4" fsmountoptions="x-systemd.growfs"
-      firmware="efi" kernelcmdline="console=hvc0 console=tty0 console=ttyS0,115200">
+      firmware="efi" kernelcmdline="console=tty0 console=ttyS0,115200 console=hvc0">
       <oemconfig>
         <!--
           Disable Kiwi's built-in partition resizing; that is very generic and

config.sh

@@ -102,6 +102,7 @@ if [[ ${kiwi_profiles:-} =~ lima ]]; then
 
     systemctl enable lima-init.service
     systemctl enable rd-init.service
+    systemctl enable journal-to-console.service
     # Disable network namespace related functionality (WSL only)
     rm -f /usr/local/lib/systemd/system/*/network-namespace.conf
     # Remove the docker config that is only used on Windows

root/usr/local/lib/systemd/system/docker.socket.d/target.conf

@@ -0,0 +1,7 @@
+# Override docker.socket to install to rancher-desktop.target
+[Install]
+WantedBy=
+WantedBy=rancher-desktop.target
+
+[Unit]
+StopPropagatedFrom=rancher-desktop.target

root/usr/local/lib/systemd/system/journal-to-console.service

@@ -0,0 +1,19 @@
+[Unit]
+Description=Mirror the journal to the console for boot diagnostics
+DefaultDependencies=no
+Requires=systemd-journald.service
+After=systemd-journald.service
+Before=sysinit.target shutdown.target
+Conflicts=shutdown.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/journalctl --boot --follow --no-hostname --no-pager --output=short
+StandardOutput=tty
+StandardError=journal
+TTYPath=/dev/console
+Restart=always
+RestartSec=1
+
+[Install]
+WantedBy=sysinit.target

root/usr/local/lib/systemd/system/lima-init.service

@@ -15,7 +15,6 @@ EnvironmentFile=/mnt/lima-cidata/lima.env
 ExecStart=/mnt/lima-cidata/boot.sh
 RemainAfterExit=yes
 TimeoutSec=0
-StandardOutput=journal+console
 
 [Install]
 WantedBy=multi-user.target

root/usr/local/lib/systemd/system/rd-init.service

@@ -15,7 +15,6 @@ EnvironmentFile=/mnt/lima-cidata/lima.env
 ExecStart=/usr/local/bin/rd-init
 RemainAfterExit=yes
 TimeoutSec=0
-StandardOutput=journal+console
 
 [Install]
 WantedBy=multi-user.target