[neon/neon/calamares-settings/Neon/unstable] /: add settings for mobile images which sets sddm.conf to load plasma mobile

Jonathan Esk-Riddell null at kde.org
Wed Oct 26 16:51:08 BST 2022


Git commit 77967736e05355c89153a6b380d23211265f1060 by Jonathan Esk-Riddell.
Committed on 26/10/2022 at 15:51.
Pushed by jriddell into branch 'Neon/unstable'.

add settings for mobile images which sets sddm.conf to load plasma mobile

M  +2    -0    debian/calamares-settings.install
M  +6    -0    desktop/usr/bin/calamares
A  +6    -0    mobile/calamares/mobile/modules/plasma-mobile-sddm-config.conf
A  +35   -0    mobile/calamares/settings.conf
A  +11   -0    mobile/usr/bin/plasma-mobile-sddm-config

https://invent.kde.org/neon/neon/calamares-settings/commit/77967736e05355c89153a6b380d23211265f1060

diff --git a/debian/calamares-settings.install b/debian/calamares-settings.install
index a2546a7..dcb5833 100644
--- a/debian/calamares-settings.install
+++ b/debian/calamares-settings.install
@@ -3,3 +3,5 @@ desktop/usr/* usr/
 oem-config/calamares/* calamares/
 oem-prepare/calamares/* calamares/
 oem-prepare/usr/* usr/
+mobile/calamares/* calamares/
+mobile/usr/* usr/
diff --git a/desktop/usr/bin/calamares b/desktop/usr/bin/calamares
index c29fb20..344cf1a 100755
--- a/desktop/usr/bin/calamares
+++ b/desktop/usr/bin/calamares
@@ -11,6 +11,12 @@ export QT_QPA_PLATFORMTHEME=kde
 export XDG_DATA_DIRS=/calamares/desktop:$XDG_DATA_DIRS:/usr/share
 export XDG_CONFIG_DIRS=/calamares/desktop:$XDG_CONFIG_DIRS:/etc/xdg
 
+if [ -f /usr/bin/startplasmamobile ]; then
+  echo "Enabling Calamares for Plasma Mobile"
+  export XDG_DATA_DIRS=/calamares/mobile:$XDG_DATA_DIRS
+  export XDG_CONFIG_DIRS=/calamares/mobile:$XDG_CONFIG_DIRS
+fi
+
 # Pinebook is not installed by default and only available on arm. Stack it on
 # top when it is available.
 if [ -d /calamares/pinebook ]; then
diff --git a/mobile/calamares/mobile/modules/plasma-mobile-sddm-config.conf b/mobile/calamares/mobile/modules/plasma-mobile-sddm-config.conf
new file mode 100755
index 0000000..c04f71b
--- /dev/null
+++ b/mobile/calamares/mobile/modules/plasma-mobile-sddm-config.conf
@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: 2022 Jonathan Esk-Riddell <jr at jriddell.org>
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+---
+timeout: 60
+script:
+    - plasma-mobile-sddm-config
diff --git a/mobile/calamares/settings.conf b/mobile/calamares/settings.conf
new file mode 100644
index 0000000..190c67a
--- /dev/null
+++ b/mobile/calamares/settings.conf
@@ -0,0 +1,35 @@
+# SPDX-FileCopyrightText: 2022 Jonathan Esk-Riddell <jr at jriddell.org>
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+---
+modules-search: [ local ]
+
+instances:
+- id: plasma-mobile-sddm-config
+  config: plasma-mobile-sddm-config.conf
+  module: shellprocess
+
+sequence:
+  - show:
+      - welcome
+      - locale
+      - keyboard
+      - users
+  - exec:
+      - machineid
+      - locale
+      - localecfg
+      - keyboard
+      - users
+      - networkcfg
+      - displaymanager
+      - shellprocess at plasma-mobile-sddm-config
+      - packages at pkg
+  - show:
+      - finished
+
+branding: neon
+prompt-install: false
+dont-chroot: true
+oem-setup: true
+disable-cancel: true
+disable-cancel-during-exec: true
diff --git a/mobile/usr/bin/plasma-mobile-sddm-config b/mobile/usr/bin/plasma-mobile-sddm-config
new file mode 100755
index 0000000..8bc558b
--- /dev/null
+++ b/mobile/usr/bin/plasma-mobile-sddm-config
@@ -0,0 +1,11 @@
+#!/bin/sh
+# SPDX-FileCopyrightText: 2022 Jonathan Esk-Riddell <jr at jriddell.org>
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+set -ex
+
+echo "I: Enabling Plasma Mobile by default"
+cat << CONF > /etc/sddm.conf
+[Autologin]
+Session=/usr/share/wayland-sessions/plasma-mobile.desktop
+CONF


More information about the Neon-commits mailing list