From 6f801db211686bfeae2eda0c6d161397ea3ccd42 Mon Sep 17 00:00:00 2001 From: Harald Sitter Date: Tue, 19 Mar 2024 02:43:32 +0100 Subject: [PATCH] experiment with my livestuff branch it's meant to setup the live system and session correctly, but testing it is rather difficult so we need to bend the image a bit to try it --- mkosi.extra/usr/bin/_kdeos-rebuild-efi | 2 +- mkosi.extra/usr/lib/systemd/system-preset/50-systemdos.preset | 1 + mkosi.postinst.chroot | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mkosi.extra/usr/bin/_kdeos-rebuild-efi b/mkosi.extra/usr/bin/_kdeos-rebuild-efi index 16883d2..3311507 100755 --- a/mkosi.extra/usr/bin/_kdeos-rebuild-efi +++ b/mkosi.extra/usr/bin/_kdeos-rebuild-efi @@ -20,7 +20,7 @@ FILES=() HOOKS=(base systemd autodetect modconf kms keyboard block sd-encrypt filesystems fsck systemd-extension plymouth) EOF -echo "native rw rootflags=subvol=@kdeos_$IMAGE_VERSION systemd.volatile=overlay systemd.firstboot=false systemd.hostname=kdeos kdeos.live=1 \ +echo "native rw rootflags=subvol=@kdeos_$IMAGE_VERSION systemd.volatile=overlay systemd.firstboot=false systemd.hostname=kdeos kdeos.live=1 plasma.live.user=live \ lsm=landlock,lockdown,yama,integrity,apparmor,bpf \ rd.systemd.debug_shell=on systemd.debug_shell=on SYSTEMD_SULOGIN_FORCE=1 \ console=ttyS0 console=tty0 \ diff --git a/mkosi.extra/usr/lib/systemd/system-preset/50-systemdos.preset b/mkosi.extra/usr/lib/systemd/system-preset/50-systemdos.preset index 72b6c00..0e502e0 100644 --- a/mkosi.extra/usr/lib/systemd/system-preset/50-systemdos.preset +++ b/mkosi.extra/usr/lib/systemd/system-preset/50-systemdos.preset @@ -9,6 +9,7 @@ enable snapd.apparmor.service enable apparmor.service enable live-user.service +enable plasma-setup-live-system.service enable kdeos-overlay.service # networkd - we use networkmanager diff --git a/mkosi.postinst.chroot b/mkosi.postinst.chroot index 2130fe6..7946f59 100755 --- a/mkosi.postinst.chroot +++ b/mkosi.postinst.chroot @@ -141,6 +141,10 @@ include \${module-definitions-dir}/kf6-qt6.ksb # To change options for modules that have already been defined, use an # 'options' block. See kf6-common-options.ksb for an example +options plasma-workspace + branch work/sitter/livestuff +end options + # kate: syntax kdesrc-buildrc; EOF