Sync with archive.

2025-07-23 14:31:29 +00:00 · 2024-02-12 17:26:01 -06:00 · 2024-02-12 17:26:01 -06:00 · f777bbfa16
commit f777bbfa16
parent a649612fd2
76 changed files with 1335 additions and 3 deletions
--- a/18
+++ b/18
@ -6,12 +6,30 @@ all:
 	# Desktop file
 	(cd lubuntu/po/ && make)
 	(cd ubuntustudio/po/ && make)
+	(cd kubuntu/po/ && make)
 	# Slideshow
 	(cd lubuntu/branding/lubuntu/lang/ && make)
 	(cd ubuntustudio/branding/ubuntustudio/lang && make)
+	# Kubuntu OEM setup stuff
+	(cd kubuntu && mkdir oemconfig && cd oemconfig && mkdir -p usr/bin && mkdir -p etc/calamares && mkdir -p usr/share/xsessions && mkdir -p usr/libexec && mkdir -p etc && mkdir -p usr/share/applications)
+	(cp kubuntu/calamares-logs-helper kubuntu/oemconfig/usr/bin/)
+	(cp kubuntu/oem/sddm.conf kubuntu/oemconfig/etc/)
+	(cp kubuntu/oem/sudoers.oem kubuntu/oemconfig/etc/ && chmod 400 kubuntu/oemconfig/etc/sudoers.oem)
+	(cp kubuntu/oem/calamares-oemfinish.sh kubuntu/oemconfig/usr/libexec/)
+	(cp kubuntu/oem/calamares-finish-oem kubuntu/oemconfig/usr/bin/)
+	(cp kubuntu/oem/calamares-finish-oem.desktop kubuntu/oemconfig/usr/share/applications/)
+	(cp -r kubuntu/branding kubuntu/oemconfig/etc/calamares/)
+	(cp -r kubuntu/oem/modules/ kubuntu/oemconfig/etc/calamares/)
+	(cp kubuntu/oem/settings.conf kubuntu/oemconfig/etc/calamares/)
+	(cp kubuntu/oem/kubuntu-oem-env/kubuntu-oem-environment.desktop kubuntu/oemconfig/usr/share/xsessions/)
+	(cp kubuntu/oem/kubuntu-oem-env/start-kubuntu-oem-env kubuntu/oemconfig/usr/libexec/)
+	(fakeroot bash -c "chown -R root:root kubuntu/oemconfig && tar cvzf kubuntu/oemconfig.tar.gz kubuntu/oemconfig")
 	# Get rid of the unnecessary files
 	find lubuntu/ -type f -iname "*.in" | xargs rm -f
 	find lubuntu/ -type f -iname "Makefile" | xargs rm -f
 	find ubuntustudio/ -type f -iname "*.in" | xargs rm -f
 	find ubuntustudio/ -type f -iname "Makefile" | xargs rm -f
+	find kubuntu/ -type f -iname "*.in" | xargs rm -f
+	find kubuntu/ -type f -iname "Makefile" | xargs rm -f
+	rm -rf kubuntu/oemconfig
 # vim:ts=4
--- a/debian/calamares-settings-kubuntu.install
+++ b/debian/calamares-settings-kubuntu.install
@ -0,0 +1,10 @@
+kubuntu/branding/ etc/calamares/
+kubuntu/calamares-logs-helper usr/bin/
+kubuntu/calamares-launch-normal usr/bin/
+kubuntu/kubuntu-calamares.desktop usr/share/applications/
+kubuntu/modules/ etc/calamares/
+kubuntu/settings.conf etc/calamares/
+kubuntu/oem/calamares-launch-oem usr/bin/
+kubuntu/oem/calamares-launch-oem.desktop usr/share/applications/
+kubuntu/oem/calamares-oemprep.sh usr/libexec/
+kubuntu/oemconfig.tar.gz etc/calamares/
--- a/debian/calamares-settings-kubuntu.lintian-overrides
+++ b/debian/calamares-settings-kubuntu.lintian-overrides
@ -0,0 +1,5 @@
+# there will be no manpage in the foreseeable future
+calamares-settings-kubuntu: no-manual-page [usr/bin/calamares-logs-helper]
+# We're just extracting a log file and preserving it for the user to look at
+# after the installation, this is normal.
+calamares-settings-kubuntu: uses-dpkg-database-directly [usr/bin/calamares-logs-helper]
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,19 @@
+calamares-settings-ubuntu (1:24.04.14) noble; urgency=medium
+
+  * Add Kubuntu OEM config.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Wed, 07 Feb 2024 17:02:27 -0600
+
+calamares-settings-ubuntu (1:24.04.13) noble; urgency=medium
+
+  * Add Kubuntu config.
+  * Update Lubuntu config to create an unencrypted /boot partition when
+    encryption is enabled.
+  * Enforce the use of Calamares 3.3.1-0ubuntu3 or later to ensure that needed
+    encryption-related features are present.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Fri, 02 Feb 2024 15:32:10 -0600
+
 calamares-settings-ubuntu (1:24.04.12) noble; urgency=medium

  * Be compliant with the current state of the deb822 Ubuntu implementation
--- a/debian/control
+++ b/debian/control
@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
 Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
-Build-Depends: calamares,
+Build-Depends: calamares (>= 3.3.1-0ubuntu3),
               cmake,
               debhelper-compat (= 13),
               extra-cmake-modules,
@ -21,13 +21,24 @@ Vcs-Browser: https://git.lubuntu.me/Lubuntu/calamares-settings-ubuntu/
 Vcs-Git: https://git.lubuntu.me/Lubuntu/calamares-settings-ubuntu.git
 Rules-Requires-Root: no

+Package: calamares-settings-kubuntu
+Architecture: all
+Depends: calamares-settings-ubuntu-common (>= ${binary:Version}),
+         ${misc:Depends}
+Conflicts: calamares-settings-ubuntustudio, calamares-settings-lubuntu
+Description: Kubuntu Calamares Settings and Branding
+ This package contains the Calamares settings and branding for Kubuntu.
+ As part of the branding the installer slideshow is contained within.
+ The settings ensure a proper Kubuntu desktop is installed with the
+ KDE Plasma desktop environment.
+
 Package: calamares-settings-lubuntu
 Architecture: all
 Depends: calamares-settings-ubuntu-common (>= ${binary:Version}),
         lubuntu-installer-prompt (>= 1.1.1),
         ${misc:Depends}
 Recommends: lubuntu-installer-prompt
-Conflicts: calamares-settings-ubuntustudio
+Conflicts: calamares-settings-ubuntustudio, calamares-settings-kubuntu
 Description: Lubuntu Calamares Settings and Branding
 This package contains the Calamares settings and branding for Lubuntu.
 As part of the branding the installer slideshow is contained within.
@ -55,7 +66,7 @@ Package: calamares-settings-ubuntustudio
 Architecture: all
 Depends: calamares-settings-ubuntu-common (>= ${binary:Version}),
         ${misc:Depends}
-Conflicts: calamares-settings-lubuntu
+Conflicts: calamares-settings-lubuntu, calamares-settings-kubuntu
 Description: Ubuntu Studio Calamares Settings and Branding
 This package contains the Calamares settings and branding for Ubuntu Studio.
 As part of the branding the installer slideshow is contained within.
--- a/debian/copyright
+++ b/debian/copyright
@ -4,6 +4,7 @@ Files: *
 Copyright: 2014 Rohan Garg <shadeslayer@systems>
           2017-2023 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
           2020 Ubuntu Studio Developers <ubuntu-studio-devel@lists.ubuntu.com>
+           2024 Kubuntu Developers <kubuntu-devel@lists.ubuntu.com>
 License: GPL-3+
 This package is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
--- a/kubuntu/README.md
+++ b/kubuntu/README.md
@ -0,0 +1,21 @@
+# Kubuntu's Calamares Settings
+
+This directory houses the Calamares settings for Kubuntu.
+
+Unless otherwise stated, the contents of this directory are licensed as follows:
+
+Copyright (C) 2018 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Copyright (C) 2024 Kubuntu Developers <kubuntu-devel@lists.ubuntu.com>
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 3
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this software. If not, see <http://www.gnu.org/licenses/>.
--- a/kubuntu/branding/kubuntu/apps.png
+++ b/kubuntu/branding/kubuntu/apps.png
--- a/kubuntu/branding/kubuntu/branding.desc
+++ b/kubuntu/branding/kubuntu/branding.desc
@ -0,0 +1,29 @@
+---
+componentName: kubuntu
+
+windowExpanding:    fullscreen
+
+strings:
+    productName:         Kubuntu
+    shortProductName:    Kubuntu
+    version:             24.04 LTS
+    shortVersion:        noble
+    versionedName:       Kubuntu
+    shortVersionedName:  Kubuntu 24.04 LTS
+    bootloaderEntryName: Ubuntu
+    productUrl:          https://lubuntu.me/
+    supportUrl:          https://lubuntu.me/links/
+
+images:
+    productLogo:         "logo.png"
+    productIcon:         "icon.png"
+    productWelcome:      "welcome.png"
+
+slideshow:               "show.qml"
+
+slideshowAPI:            1
+
+style:
+   SidebarBackground:    "#808080"
+   SidebarText:          "#FFFFFF"
+   SidebarTextCurrent:   "#0068C8"
--- a/kubuntu/branding/kubuntu/desktop.png
+++ b/kubuntu/branding/kubuntu/desktop.png
--- a/kubuntu/branding/kubuntu/enjoy.png
+++ b/kubuntu/branding/kubuntu/enjoy.png
--- a/kubuntu/branding/kubuntu/icon.png
+++ b/kubuntu/branding/kubuntu/icon.png
--- a/kubuntu/branding/kubuntu/lightweight.png
+++ b/kubuntu/branding/kubuntu/lightweight.png
--- a/kubuntu/branding/kubuntu/logo.png
+++ b/kubuntu/branding/kubuntu/logo.png
--- a/kubuntu/branding/kubuntu/show.qml
+++ b/kubuntu/branding/kubuntu/show.qml
@ -0,0 +1,93 @@
+import QtQuick 2.0;
+import calamares.slideshow 1.0;
+
+Presentation
+{
+    id: presentation
+
+    Timer {
+        interval: 15000
+        running: true
+        repeat: true
+        onTriggered: presentation.goToNextSlide()
+    }
+    Slide {
+        Image {
+            anchors.centerIn: parent
+            id: image1
+            x: 0
+            y: 0
+            width: 810
+            height: 485
+            fillMode: Image.PreserveAspectFit
+            smooth: true
+            source: "lightweight.png"
+        }
+    }
+    Slide {
+        Image {
+            anchors.centerIn: parent
+            id: image2
+            x: 0
+            y: 0
+            width: 810
+            height: 485
+            fillMode: Image.PreserveAspectFit
+            smooth: true
+            source: "apps.png"
+        }
+    }
+    Slide {
+        Image {
+            anchors.centerIn: parent
+            id: image3
+            x: 0
+            y: 0
+            width: 810
+            height: 485
+            fillMode: Image.PreserveAspectFit
+            smooth: true
+            source: "store.png"
+        }
+    }
+    Slide {
+        Image {
+            anchors.centerIn: parent
+            id: image4
+            x: 0
+            y: 0
+            width: 810
+            height: 485
+            fillMode: Image.PreserveAspectFit
+            smooth: true
+            source: "desktop.png"
+        }
+    }
+    Slide {
+        Image {
+            anchors.centerIn: parent
+            id: image5
+            x: 0
+            y: 0
+            width: 810
+            height: 485
+            fillMode: Image.PreserveAspectFit
+            smooth: true
+            source: "support.png"
+        }
+    }
+    Slide {
+        Image {
+            anchors.centerIn: parent
+            id: image6
+            x: 0
+            y: 0
+            width: 810
+            height: 485
+            fillMode: Image.PreserveAspectFit
+            smooth: true
+            source: "enjoy.png"
+        }
+
+    }
+}
--- a/kubuntu/branding/kubuntu/store.png
+++ b/kubuntu/branding/kubuntu/store.png
--- a/kubuntu/branding/kubuntu/support.png
+++ b/kubuntu/branding/kubuntu/support.png
--- a/kubuntu/branding/kubuntu/welcome-oem.png
+++ b/kubuntu/branding/kubuntu/welcome-oem.png
--- a/kubuntu/branding/kubuntu/welcome.png
+++ b/kubuntu/branding/kubuntu/welcome.png
--- a/kubuntu/calamares-launch-normal
+++ b/kubuntu/calamares-launch-normal
@ -0,0 +1,15 @@
+#!/bin/bash
+#
+# Launch Calamares normally.
+
+if [ -e '/etc/calamares/OEM_MODE_ACTIVATED' ]; then
+  msg="$(cat <<EOL
+The installer was previously run in OEM mode. Please reboot to reset the
+configuration and try again.
+EOL
+  )";
+  kdialog --msgbox "${msg}";
+  exit 1;
+fi
+
+calamares -D8;
--- a/kubuntu/calamares-logs-helper
+++ b/kubuntu/calamares-logs-helper
@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -ex
+
+root=$1
+install_dir=$root/var/log/installer
+[ -d $install_dir ] || mkdir -p $install_dir
+
+cp $HOME/.cache/calamares/session.log $install_dir/debug
+
+cp /cdrom/.disk/info $install_dir/media-info
+cp /var/log/casper.log $install_dir/casper.log
+cp /var/log/syslog $install_dir/syslog
+
+gzip --stdout $root/var/lib/dpkg/status > $install_dir/initial-status.gz
+
+# OEM id isn't a thing, when in OEM mode ubiquity would also archive that.
+# https://github.com/calamares/calamares/issues/943
+
+chmod -v 600 $install_dir/*
+# Make these world readable, they can absolutely not contain anything relevant
+# to security.
+chmod -v 644 $install_dir/initial-status.gz
+chmod -v 644 $install_dir/media-info
--- a/kubuntu/kubuntu-calamares.desktop.in
+++ b/kubuntu/kubuntu-calamares.desktop.in
@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+_Name=Install Kubuntu 24.04 LTS
+_GenericName=Install Kubuntu
+Exec=sudo -E /usr/bin/calamares-launch-normal
+_Comment=Calamares — System Installer
+Icon=system-software-install
+Terminal=false
+StartupNotify=true
+Categories=Qt;System;
+Keywords=installer;calamares;system;
--- a/kubuntu/modules/after_bootloader_context.conf
+++ b/kubuntu/modules/after_bootloader_context.conf
@ -0,0 +1,5 @@
+---
+dontChroot: false
+timeout: 120
+firmwareType:
+    "*": "-rm ${ROOT}/home/${USER}/Desktop/kubuntu-calamares.desktop"
--- a/kubuntu/modules/automirror.conf
+++ b/kubuntu/modules/automirror.conf
@ -0,0 +1,6 @@
+---
+baseUrl: archive.ubuntu.com
+distribution: Kubuntu
+geoip:
+    style: "xml"
+    url:   "https://geoip.ubuntu.com/lookup"
--- a/kubuntu/modules/displaymanager.conf
+++ b/kubuntu/modules/displaymanager.conf
@ -0,0 +1,9 @@
+displaymanagers:
+  - sddm
+
+defaultDesktopEnvironment:
+    executable: "startkde"
+    desktopFile: "plasma"
+
+basicSetup: false
+sysconfigSetup: false
--- a/kubuntu/modules/oemid.conf
+++ b/kubuntu/modules/oemid.conf
@ -0,0 +1,2 @@
+---
+batch-identifier: kubuntu-2404-${DATE}
--- a/kubuntu/modules/packages.conf
+++ b/kubuntu/modules/packages.conf
@ -0,0 +1,16 @@
+update_db: true
+backend: apt
+operations:
+  - remove:
+      - "^live-*"
+      - calamares-settings-kubuntu
+      - calamares
+      - zram-config
+      - cifs-utils
+  - try_install:
+      - language-pack-$LOCALE
+      - language-pack-gnome-$LOCALE
+      - language-pack-kde-$LOCALE
+      - hunspell-$LOCALE
+      - libreoffice-help-$LOCALE
+      - libreoffice-l10n-$LOCALE
--- a/kubuntu/modules/partition.conf
+++ b/kubuntu/modules/partition.conf
@ -0,0 +1,21 @@
+efiSystemPartition: "/boot/efi"
+enableLuksAutomatedPartitioning: true
+luksGeneration: luks2
+userSwapChoices:
+    - none
+    - file
+initialSwapChoice: file
+drawNestedPartitions: true
+defaultFileSystemType: "ext4"
+availableFileSystemTypes: ["ext4","btrfs","xfs"]
+partitionLayout:
+    - name: "kubuntu_boot"
+      filesystem: ext4
+      noEncrypt: true
+      onlyPresentWithEncryption: true
+      mountPoint: "/boot"
+      size: 4G
+    - name: "kubuntu_2404"
+      filesystem: unknown
+      mountPoint: "/"
+      size: 100%
--- a/kubuntu/modules/shellprocess_oemprep.conf
+++ b/kubuntu/modules/shellprocess_oemprep.conf
@ -0,0 +1,5 @@
+---
+dontChroot: true
+timeout: 120
+script:
+    - "/usr/libexec/calamares-oemprep.sh ${ROOT}"
--- a/kubuntu/modules/unpackfs.conf
+++ b/kubuntu/modules/unpackfs.conf
@ -0,0 +1,5 @@
+---
+unpack:
+    -   source: "/cdrom/casper/filesystem.squashfs"
+        sourcefs: "squashfs"
+        destination: ""
--- a/kubuntu/modules/users.conf
+++ b/kubuntu/modules/users.conf
@ -0,0 +1,23 @@
+---
+doAutologin: false
+setRootPassword: false
+sudoersGroup: sudo
+defaultGroups:
+    - adm
+    - cdrom
+    - dip
+    - lpadmin
+    - plugdev
+    - name: sambashare
+      must_exist: false
+      system: true
+    - sudo
+passwordRequirements:
+    nonempty: true
+    minLength: 0
+    maxLength: 0
+# Explicitly set the shell instead of deferring to Calamares. We have a platform
+# expectation derived from Ubuntu here.
+user:
+  shell: /bin/bash
+  forbidden_names: [ root ]
--- a/kubuntu/modules/users.conf.oem
+++ b/kubuntu/modules/users.conf.oem
@ -0,0 +1,31 @@
+---
+doAutologin: false
+setRootPassword: false
+sudoersGroup: sudo
+defaultGroups:
+    - adm
+    - cdrom
+    - dip
+    - lpadmin
+    - plugdev
+    - name: sambashare
+      must_exist: false
+      system: true
+    - sudo
+passwordRequirements:
+    nonempty: true
+    minLength: 0
+    maxLength: 0
+# Explicitly set the shell instead of deferring to Calamares. We have a platform
+# expectation derived from Ubuntu here.
+user:
+  shell: /bin/bash
+  forbidden_names: [ root ]
+# Force the user of an OEM user
+presets:
+  fullName:
+    value: "OEM configuration"
+    editable: false
+  loginName:
+    value: "oem"
+    editable: false
--- a/kubuntu/modules/welcome.conf
+++ b/kubuntu/modules/welcome.conf
@ -0,0 +1,26 @@
+---
+showSupportUrl:         true
+showKnownIssuesUrl:     true
+showReleaseNotesUrl:    true
+# WARNING: Calamares documentation indicates that showDonateUrl will be moved to branding in the future. Be prepared for things to break right here.
+showDonateUrl:  https://lubuntu.me/donate/
+
+requirements:
+    requiredStorage:    8
+    requiredRam:        0.5
+    internetCheckUrl:	https://lubuntu.me
+
+    check:
+        - storage
+        - ram
+        - power
+        - internet
+        - root
+    required:
+        - root
+        - storage
+        - ram
+geoip:
+    style:  "xml"
+    url:    "https://geoip.ubuntu.com/lookup"
+    selector: "CountryCode"
--- a/kubuntu/oem/calamares-finish-oem
+++ b/kubuntu/oem/calamares-finish-oem
@ -0,0 +1,13 @@
+#!/bin/bash
+
+msg="$(cat <<EOL
+You are about to disable OEM configuration mode. The system will boot into the
+account setup wizard the next time it is started.
+
+Are you sure you want to continue?
+EOL
+)";
+
+if kdialog --warningyesno "${msg}"; then
+  sed -i "s/Session=plasma/Session=kubuntu-oem-environment/" /etc/sddm.conf
+fi
--- a/kubuntu/oem/calamares-finish-oem.desktop
+++ b/kubuntu/oem/calamares-finish-oem.desktop
@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Finish OEM preparation
+Exec=sudo /usr/bin/calamares-finish-oem
+Icon=system-software-install
+Terminal=false
+StartupNotify=true
+Categories=Qt;System;
+Keywords=installer;calamares;system;
--- a/kubuntu/oem/calamares-launch-oem
+++ b/kubuntu/oem/calamares-launch-oem
@ -0,0 +1,42 @@
+#!/bin/bash
+#
+# Enables OEM installaiton mode in Calamares.
+
+if [ -e '/etc/calamares/OEM_MODE_ACTIVATED' ]; then
+  calamares -D8;
+  exit;
+fi
+
+msg="$(cat <<EOL
+You are about to install the OS in OEM mode. This will prepare the system for
+distribution to an end user, providing them with an account setup wizard. If
+you do not need this capability, please cancel and use the normal install
+method.
+
+Are you sure you want to continue?
+EOL
+)";
+
+if kdialog --warningyesno "${msg}"; then
+  # Tweak branding to make it clear that OEM installation mode is active
+  cp /etc/calamares/branding/kubuntu/welcome-oem.png /etc/calamares/branding/kubuntu/welcome.png;
+
+  # Don't remove Calamares from the installed system.
+  sed -i '/- calamares$/d' /etc/calamares/modules/packages.conf;
+
+  # Enable oemid module, backslashes are needed for proper indentation
+  sed -i "/- welcome$/a \ \ - oemid" /etc/calamares/settings.conf;
+
+  # Enable OEM prep module
+  sed -i "/- packages$/a \ \ - shellprocess@oemprep" /etc/calamares/settings.conf;
+
+  # Force the user of an OEM configuration user
+  cp /etc/calamares/modules/users.conf.oem /etc/calamares/modules/users.conf;
+
+  # Drop a file so that it can be seen that OEM installation mode is already
+  # active
+  touch /etc/calamares/OEM_MODE_ACTIVATED;
+
+  # Launch Calamares
+  calamares -D8;
+fi
--- a/kubuntu/oem/calamares-launch-oem.desktop
+++ b/kubuntu/oem/calamares-launch-oem.desktop
@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Install Kubuntu 24.04 LTS (OEM mode)
+Exec=sudo -E /usr/bin/calamares-launch-oem
+Icon=system-software-install
+Terminal=false
+StartupNotify=true
+Categories=Qt;System;
+Keywords=installer;calamares;system;
--- a/kubuntu/oem/calamares-oemfinish.sh
+++ b/kubuntu/oem/calamares-oemfinish.sh
@ -0,0 +1,7 @@
+#!/bin/bash
+#
+# Remove OEM files from the system.
+
+rm -rf /etc/calamares /usr/bin/basicwallpaper /usr/bin/calamares-finish-oem /usr/share/applications/calamares-finish-oem.desktop /etc/sddm.conf /usr/share/xsessions/kubuntu-oem-environment.desktop /usr/libexec/start-kubuntu-oem-env /etc/sudoers
+
+mv /etc/sudoers.orig /etc/sudoers
--- a/kubuntu/oem/calamares-oemprep.sh
+++ b/kubuntu/oem/calamares-oemprep.sh
@ -0,0 +1,11 @@
+#!/bin/bash
+#
+# Puts the installed system into OEM configuration mode. Argument 1 is the
+# path to the installed system's root directory.
+
+# Install the OEM configuration for Calamares
+tar xvzf /etc/calamares/oemconfig.tar.gz -C "$1" --strip-components=2;
+
+# Enable passwordless sudo for the OEM user, making sure this can be undone later
+mv "$1"/etc/sudoers "$1"/etc/sudoers.orig
+mv "$1"/etc/sudoers.oem "$1"/etc/sudoers
--- a/kubuntu/oem/kubuntu-oem-env/kubuntu-oem-environment.desktop
+++ b/kubuntu/oem/kubuntu-oem-env/kubuntu-oem-environment.desktop
@ -0,0 +1,5 @@
+[Desktop Entry]
+Exec=/usr/libexec/start-kubuntu-oem-env
+Name=Kubuntu OEM Environment
+Comment=Starts the Kubuntu OEM Environment
+Type=Application
--- a/kubuntu/oem/kubuntu-oem-env/start-kubuntu-oem-env
+++ b/kubuntu/oem/kubuntu-oem-env/start-kubuntu-oem-env
@ -0,0 +1,10 @@
+#!/bin/bash
+# Starts the Kubuntu OEM Environment.
+export QT_STYLE_OVERRIDE="Breeze"
+
+/usr/bin/kwin_x11 &
+/usr/bin/basicwallpaper /usr/share/wallpapers/Next/contents/3840x2160.png &
+sudo -E /usr/bin/calamares -D8 # This is intentionally *not* backgrounded.
+# If it exits...
+killall basicwallpaper
+killall kwin_x11
--- a/kubuntu/oem/modules/finished.conf
+++ b/kubuntu/oem/modules/finished.conf
@ -0,0 +1,3 @@
+---
+restartNowMode: user-checked
+restartNowCommand: "systemctl -i reboot"
--- a/kubuntu/oem/modules/locale.conf
+++ b/kubuntu/oem/modules/locale.conf
@ -0,0 +1,8 @@
+---
+region: "America"
+zone: "New_York"
+localeGenPath: "/etc/locale.gen"
+geoip:
+    style: "xml"
+    url:   "https://geoip.ubuntu.com/lookup"
+    selector: "TimeZone"
--- a/kubuntu/oem/modules/machineid.conf
+++ b/kubuntu/oem/modules/machineid.conf
@ -0,0 +1,8 @@
+---
+# Whether to create /etc/machine-id for systemd.
+systemd: true
+# Whether to create /var/lib/dbus/machine-id for D-Bus.
+dbus: true
+# Whether /var/lib/dbus/machine-id should be a symlink to /etc/machine-id
+# (ignored if dbus is false, or if there is no /etc/machine-id to point to).
+dbus-symlink: true
--- a/kubuntu/oem/modules/packages.conf
+++ b/kubuntu/oem/modules/packages.conf
@ -0,0 +1,5 @@
+update_db: true
+backend: apt
+operations:
+  - remove:
+      - calamares
--- a/kubuntu/oem/modules/removeuser.conf
+++ b/kubuntu/oem/modules/removeuser.conf
@ -0,0 +1,2 @@
+---
+username: oem
--- a/kubuntu/oem/modules/shellprocess_oemfinish.conf
+++ b/kubuntu/oem/modules/shellprocess_oemfinish.conf
@ -0,0 +1,5 @@
+---
+dontChroot: true
+timeout: 120
+script:
+    - "/usr/libexec/calamares-oemfinish.sh ${ROOT}"
--- a/kubuntu/oem/modules/users.conf
+++ b/kubuntu/oem/modules/users.conf
@ -0,0 +1,23 @@
+---
+doAutologin: false
+setRootPassword: false
+sudoersGroup: sudo
+defaultGroups:
+    - adm
+    - cdrom
+    - dip
+    - lpadmin
+    - plugdev
+    - name: sambashare
+      must_exist: false
+      system: true
+    - sudo
+passwordRequirements:
+    nonempty: true
+    minLength: 0
+    maxLength: 0
+# Explicitly set the shell instead of deferring to Calamares. We have a platform
+# expectation derived from Ubuntu here.
+user:
+  shell: /bin/bash
+  forbidden_names: [ root ]
--- a/kubuntu/oem/modules/welcome.conf
+++ b/kubuntu/oem/modules/welcome.conf
@ -0,0 +1,26 @@
+---
+showSupportUrl:         true
+showKnownIssuesUrl:     true
+showReleaseNotesUrl:    true
+# WARNING: Calamares documentation indicates that showDonateUrl will be moved to branding in the future. Be prepared for things to break right here.
+showDonateUrl:  https://lubuntu.me/donate/
+
+requirements:
+    requiredStorage:    8
+    requiredRam:        0.5
+    internetCheckUrl:	https://lubuntu.me
+
+    check:
+        - storage
+        - ram
+        - power
+        - internet
+        - root
+    required:
+        - root
+        - storage
+        - ram
+geoip:
+    style:  "xml"
+    url:    "https://geoip.ubuntu.com/lookup"
+    selector: "CountryCode"
--- a/kubuntu/oem/sddm.conf
+++ b/kubuntu/oem/sddm.conf
@ -0,0 +1,3 @@
+[Autologin]
+Session=plasma
+User=oem
--- a/kubuntu/oem/settings.conf
+++ b/kubuntu/oem/settings.conf
@ -0,0 +1,32 @@
+---
+modules-search: [ local ]
+
+instances:
+- id: oemfinish
+  module: shellprocess
+  config: shellprocess_oemfinish.conf
+
+sequence:
+- show:
+  - welcome
+  - locale
+  - keyboard
+  - users
+- exec:
+  - machineid
+  - locale
+  - keyboard
+  - localecfg
+  - packages
+  - users
+  - shellprocess@oemfinish
+  - removeuser
+- show:
+  - finished
+
+branding: kubuntu
+prompt-install: true
+dont-chroot: true
+oem-setup: true
+disable-cancel: true
+disable-cancel-during-exec: true
--- a/kubuntu/oem/sudoers.oem
+++ b/kubuntu/oem/sudoers.oem
@ -0,0 +1,56 @@
+#
+# This file MUST be edited with the 'visudo' command as root.
+#
+# Please consider adding local content in /etc/sudoers.d/ instead of
+# directly modifying this file.
+#
+# See the man page for details on how to write a sudoers file.
+#
+Defaults	env_reset
+Defaults	mail_badpass
+Defaults	secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin"
+Defaults	use_pty
+
+# This preserves proxy settings from user environments of root
+# equivalent users (group sudo)
+#Defaults:%sudo env_keep += "http_proxy https_proxy ftp_proxy all_proxy no_proxy"
+
+# This allows running arbitrary commands, but so does ALL, and it means
+# different sudoers have their choice of editor respected.
+#Defaults:%sudo env_keep += "EDITOR"
+
+# Completely harmless preservation of a user preference.
+#Defaults:%sudo env_keep += "GREP_COLOR"
+
+# While you shouldn't normally run git as root, you need to with etckeeper
+#Defaults:%sudo env_keep += "GIT_AUTHOR_* GIT_COMMITTER_*"
+
+# Per-user preferences; root won't have sensible values for them.
+#Defaults:%sudo env_keep += "EMAIL DEBEMAIL DEBFULLNAME"
+
+# "sudo scp" or "sudo rsync" should be able to use your SSH agent.
+#Defaults:%sudo env_keep += "SSH_AGENT_PID SSH_AUTH_SOCK"
+
+# Ditto for GPG agent
+#Defaults:%sudo env_keep += "GPG_AGENT_INFO"
+
+# Host alias specification
+
+# User alias specification
+
+# Cmnd alias specification
+
+# User privilege specification
+root	ALL=(ALL:ALL) ALL
+
+# Members of the admin group may gain root privileges
+%admin ALL=(ALL) ALL
+
+# Allow members of group sudo to execute any command
+%sudo	ALL=(ALL:ALL) ALL
+
+# See sudoers(5) for more information on "@include" directives:
+@includedir /etc/sudoers.d
+
+# OEM CONFIGURATION ONLY: oem user has passwordless sudo
+oem   ALL=(ALL:ALL) NOPASSWD: ALL
--- a/kubuntu/po/Makefile
+++ b/kubuntu/po/Makefile
@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+
+POTFILES := $(shell cat POTFILES.in)
+
+all: generate-po-files
+
+generate-pot: POTFILES.in
+	intltool-update --pot --gettext-package=calamares-settings-kubuntu
+
+generate-po-files:
+	for i in $(POTFILES); do \
+		f=$$(echo $$i | sed 's/\.in//'); \
+		intltool-merge -d . ../$$i ../$$f; \
+	done
+
+update-po:
+	for i in *.po; do \
+		code=$$(echo $$i | sed 's/.po//'); \
+		intltool-update --gettext-package=calamares-settings-kubuntu --dist $$code; \
+	done
+
+# vim:ts=4
--- a/kubuntu/po/POTFILES.in
+++ b/kubuntu/po/POTFILES.in
@ -0,0 +1 @@
+kubuntu-calamares.desktop.in
--- a/kubuntu/po/ar.po
+++ b/kubuntu/po/ar.po
@ -0,0 +1,28 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-07-10 02:36-0500\n"
+"PO-Revision-Date: 2024-02-05 00:00+0000\n"
+"Last-Translator: Aaron Rainbolt <arraybolt3@ubuntu.com>\n"
+"Language-Team: Arabic <https://translate.lubuntu.me/projects/lubuntu/"
+"calamares-settings-lubuntu-desktop/ar/>\n"
+"Language: ar\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"X-Generator: Weblate 3.1-dev\n"
+
+#: ../kubuntu-calamares.desktop.in.h:1
+msgid "Install Kubuntu 24.04 LTS"
+msgstr "تثبيت كوبونتو 24.04 LTS"
+
+#: ../kubuntu-calamares.desktop.in.h:2
+msgid "Install Kubuntu"
+msgstr "تثبيت كوبونتو"
+
+#: ../kubuntu-calamares.desktop.in.h:3
+msgid "Calamares — System Installer"
+msgstr "كالاماريس - مثبت النظام"
--- a/kubuntu/po/be.po
+++ b/kubuntu/po/be.po
@ -0,0 +1,25 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-07-10 02:36-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: be\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 2.3.0\n"
+
+#: ../kubuntu-calamares.desktop.in.h:1
+msgid "Install Kubuntu 24.04 LTS"
+msgstr ""
+
+#: ../kubuntu-calamares.desktop.in.h:2
+msgid "Install Kubuntu"
+msgstr ""
+
+#: ../kubuntu-calamares.desktop.in.h:3
+msgid "Calamares — System Installer"
+msgstr ""
--- a/kubuntu/po/ca.po
+++ b/kubuntu/po/ca.po
@ -0,0 +1,27 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-07-10 02:36-0500\n"
+"PO-Revision-Date: 2024-02-05 00:00+0000\n"
+"Last-Translator: Aaron Rainbolt <arraybolt3@ubuntu.com>\n"
+"Language-Team: Catalan <https://translate.lubuntu.me/projects/lubuntu/"
+"calamares-settings-lubuntu-desktop/ca/>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.1-dev\n"
+
+#: ../kubuntu-calamares.desktop.in.h:1
+msgid "Install Kubuntu 24.04 LTS"
+msgstr "Instal·lar Kubuntu 24.04 LTS"
+
+#: ../kubuntu-calamares.desktop.in.h:2
+msgid "Install Kubuntu"
+msgstr "Instal·lar Kubuntu"
+
+#: ../kubuntu-calamares.desktop.in.h:3
+msgid "Calamares — System Installer"
+msgstr "Calamares — Instal·lador del Sistema"
--- a/kubuntu/po/calamares-settings-kubuntu.pot
+++ b/kubuntu/po/calamares-settings-kubuntu.pot
@ -0,0 +1,30 @@
+# Base translation file for Lubuntu's Calamares settings
+# Copyright (C) 2018 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+# This file is distributed under the same license as the package.
+# Simon Quigley <tsimonq2@ubuntu.com>, 2018.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-07-10 02:36-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../kubuntu-calamares.desktop.in.h:1
+msgid "Install Kubuntu 24.04 LTS"
+msgstr ""
+
+#: ../kubuntu-calamares.desktop.in.h:2
+msgid "Install Kubuntu"
+msgstr ""
+
+#: ../kubuntu-calamares.desktop.in.h:3
+msgid "Calamares — System Installer"
+msgstr ""
--- a/kubuntu/po/da.po
+++ b/kubuntu/po/da.po
@ -0,0 +1,27 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-07-10 02:36-0500\n"
+"PO-Revision-Date: 2024-02-05 00:00+0000\n"
+"Last-Translator: Aaron Rainbolt <arraybolt3@ubuntu.com>\n"
+"Language-Team: Danish <https://translate.lubuntu.me/projects/lubuntu/"
+"calamares-settings-lubuntu-desktop/da/>\n"
+"Language: da\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.1-dev\n"
+
+#: ../kubuntu-calamares.desktop.in.h:1
+msgid "Install Kubuntu 24.04 LTS"
+msgstr "Installer Kubuntu 24.04 LTS"
+
+#: ../kubuntu-calamares.desktop.in.h:2
+msgid "Install Kubuntu"
+msgstr "Installer Kubuntu"
+
+#: ../kubuntu-calamares.desktop.in.h:3
+msgid "Calamares — System Installer"
+msgstr "Calamares - System installation"
--- a/kubuntu/po/de.po
+++ b/kubuntu/po/de.po
@ -0,0 +1,27 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-07-10 02:36-0500\n"
+"PO-Revision-Date: 2024-02-05 00:00+0000\n"
+"Last-Translator: Aaron Rainbolt <arraybolt3@ubuntu.com>\n"
+"Language-Team: German <https://translate.lubuntu.me/projects/lubuntu/"
+"calamares-settings-lubuntu-desktop/de/>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.1-dev\n"
+
+#: ../kubuntu-calamares.desktop.in.h:1
+msgid "Install Kubuntu 24.04 LTS"
+msgstr "Kubuntu 24.04 LTS installieren"
+
+#: ../kubuntu-calamares.desktop.in.h:2
+msgid "Install Kubuntu"
+msgstr "Kubuntu installieren"
+
+#: ../kubuntu-calamares.desktop.in.h:3
+msgid "Calamares — System Installer"
+msgstr "Calamares — System Installer"
--- a/kubuntu/po/el.po
+++ b/kubuntu/po/el.po
@ -0,0 +1,25 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-07-10 02:36-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 2.3.0\n"
+
+#: ../kubuntu-calamares.desktop.in.h:1
+msgid "Install Kubuntu 24.04 LTS"
+msgstr ""
+
+#: ../kubuntu-calamares.desktop.in.h:2
+msgid "Install Kubuntu"
+msgstr ""
+
+#: ../kubuntu-calamares.desktop.in.h:3
+msgid "Calamares — System Installer"
+msgstr ""
--- a/kubuntu/po/es.po
+++ b/kubuntu/po/es.po
@ -0,0 +1,27 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-07-10 02:36-0500\n"
+"PO-Revision-Date: 2024-02-05 00:00+0000\n"
+"Last-Translator: Aaron Rainbolt <arraybolt3@ubuntu.com>\n"
+"Language-Team: Spanish <https://translate.lubuntu.me/projects/lubuntu/"
+"calamares-settings-lubuntu-desktop/es/>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.1-dev\n"
+
+#: ../kubuntu-calamares.desktop.in.h:1
+msgid "Install Kubuntu 24.04 LTS"
+msgstr "Instalar Kubuntu 24.04 LTS"
+
+#: ../kubuntu-calamares.desktop.in.h:2
+msgid "Install Kubuntu"
+msgstr "Instalar Kubuntu"
+
+#: ../kubuntu-calamares.desktop.in.h:3
+msgid "Calamares — System Installer"
+msgstr "Calamares — Instalador del Sistema"
--- a/kubuntu/po/et.po
+++ b/kubuntu/po/et.po
@ -0,0 +1,25 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-07-10 02:36-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: et\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 2.3.0\n"
+
+#: ../kubuntu-calamares.desktop.in.h:1
+msgid "Install Kubuntu 24.04 LTS"
+msgstr ""
+
+#: ../kubuntu-calamares.desktop.in.h:2
+msgid "Install Kubuntu"
+msgstr ""
+
+#: ../kubuntu-calamares.desktop.in.h:3
+msgid "Calamares — System Installer"
+msgstr ""
--- a/kubuntu/po/eu.po
+++ b/kubuntu/po/eu.po
@ -0,0 +1,25 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-07-10 02:36-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: eu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 2.3.0\n"
+
+#: ../kubuntu-calamares.desktop.in.h:1
+msgid "Install Kubuntu 24.04 LTS"
+msgstr ""
+
+#: ../kubuntu-calamares.desktop.in.h:2
+msgid "Install Kubuntu"
+msgstr ""
+
+#: ../kubuntu-calamares.desktop.in.h:3
+msgid "Calamares — System Installer"
+msgstr ""
--- a/kubuntu/po/fr.po
+++ b/kubuntu/po/fr.po
@ -0,0 +1,27 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-07-10 02:36-0500\n"
+"PO-Revision-Date: 2024-02-05 00:00+0000\n"
+"Last-Translator: Aaron Rainbolt <arraybolt3@ubuntu.com>\n"
+"Language-Team: French <https://translate.lubuntu.me/projects/lubuntu/"
+"calamares-settings-lubuntu-desktop/fr/>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 3.1-dev\n"
+
+#: ../kubuntu-calamares.desktop.in.h:1
+msgid "Install Kubuntu 24.04 LTS"
+msgstr "Installer Kubuntu 24.04 LTS"
+
+#: ../kubuntu-calamares.desktop.in.h:2
+msgid "Install Kubuntu"
+msgstr "Installer Kubuntu"
+
+#: ../kubuntu-calamares.desktop.in.h:3
+msgid "Calamares — System Installer"
+msgstr "Calamares  — Installateur de votre system"
--- a/kubuntu/po/gl.po
+++ b/kubuntu/po/gl.po
@ -0,0 +1,25 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-07-10 02:36-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: gl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 2.3.0\n"
+
+#: ../kubuntu-calamares.desktop.in.h:1
+msgid "Install Kubuntu 24.04 LTS"
+msgstr ""
+
+#: ../kubuntu-calamares.desktop.in.h:2
+msgid "Install Kubuntu"
+msgstr ""
+
+#: ../kubuntu-calamares.desktop.in.h:3
+msgid "Calamares — System Installer"
+msgstr ""
--- a/kubuntu/po/it.po
+++ b/kubuntu/po/it.po
@ -0,0 +1,32 @@
+# Base translation file for Lubuntu's Calamares settings
+# Copyright (C) 2018 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+# This file is distributed under the same license as the package.
+# Simon Quigley <tsimonq2@ubuntu.com>, 2018.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-07-10 02:36-0500\n"
+"PO-Revision-Date: 2024-02-05 00:00+0000\n"
+"Last-Translator: Aaron Rainbolt <arraybolt3@ubuntu.com>\n"
+"Language-Team: Italian <https://translate.lubuntu.me/projects/lubuntu/"
+"calamares-settings-lubuntu-desktop/it/>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.1-dev\n"
+
+#: ../kubuntu-calamares.desktop.in.h:1
+msgid "Install Kubuntu 24.04 LTS"
+msgstr "Installa Kubuntu 24.04 LTS"
+
+#: ../kubuntu-calamares.desktop.in.h:2
+msgid "Install Kubuntu"
+msgstr "Installa Kubuntu"
+
+#: ../kubuntu-calamares.desktop.in.h:3
+msgid "Calamares — System Installer"
+msgstr "Calamares — Installatore del Sistema"
--- a/kubuntu/po/ko.po
+++ b/kubuntu/po/ko.po
@ -0,0 +1,25 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-07-10 02:36-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ko\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 2.3.0\n"
+
+#: ../kubuntu-calamares.desktop.in.h:1
+msgid "Install Kubuntu 24.04 LTS"
+msgstr ""
+
+#: ../kubuntu-calamares.desktop.in.h:2
+msgid "Install Kubuntu"
+msgstr ""
+
+#: ../kubuntu-calamares.desktop.in.h:3
+msgid "Calamares — System Installer"
+msgstr ""
--- a/kubuntu/po/no.po
+++ b/kubuntu/po/no.po
@ -0,0 +1,27 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-07-10 02:36-0500\n"
+"PO-Revision-Date: 2024-02-05 00:00+0000\n"
+"Last-Translator: Aaron Rainbolt <arraybolt3@ubuntu.com>\n"
+"Language-Team: Norwegian Bokmål <https://translate.lubuntu.me/projects/"
+"lubuntu/calamares-settings-lubuntu-desktop/nb/>\n"
+"Language: no\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.1-dev\n"
+
+#: ../kubuntu-calamares.desktop.in.h:1
+msgid "Install Kubuntu 24.04 LTS"
+msgstr "Installer Kubuntu 24.04 LTS"
+
+#: ../kubuntu-calamares.desktop.in.h:2
+msgid "Install Kubuntu"
+msgstr "Installer Kubuntu"
+
+#: ../kubuntu-calamares.desktop.in.h:3
+msgid "Calamares — System Installer"
+msgstr "Calamares — System installerer"
--- a/kubuntu/po/pl.po
+++ b/kubuntu/po/pl.po
@ -0,0 +1,28 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-07-10 02:36-0500\n"
+"PO-Revision-Date: 2024-02-05 00:00+0000\n"
+"Last-Translator: Aaron Rainbolt <arraybolt3@ubuntu.com>\n"
+"Language-Team: Polish <https://translate.lubuntu.me/projects/lubuntu/"
+"calamares-settings-lubuntu-desktop/pl/>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 3.1-dev\n"
+
+#: ../kubuntu-calamares.desktop.in.h:1
+msgid "Install Kubuntu 24.04 LTS"
+msgstr "Zainstaluj Kubuntu 24.04 LTS"
+
+#: ../kubuntu-calamares.desktop.in.h:2
+msgid "Install Kubuntu"
+msgstr "Zainstaluj Kubuntu"
+
+#: ../kubuntu-calamares.desktop.in.h:3
+msgid "Calamares — System Installer"
+msgstr "Calamares — Instalator systemu"
--- a/kubuntu/po/pt.po
+++ b/kubuntu/po/pt.po
@ -0,0 +1,27 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-07-10 02:36-0500\n"
+"PO-Revision-Date: 2024-02-05 00:00+0000\n"
+"Last-Translator: Aaron Rainbolt <arraybolt3@ubuntu.com>\n"
+"Language-Team: Portuguese <https://translate.lubuntu.me/projects/lubuntu/"
+"calamares-settings-lubuntu-desktop/pt/>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 3.1-dev\n"
+
+#: ../kubuntu-calamares.desktop.in.h:1
+msgid "Install Kubuntu 24.04 LTS"
+msgstr "Instalar o Kubuntu 24.04 LTS"
+
+#: ../kubuntu-calamares.desktop.in.h:2
+msgid "Install Kubuntu"
+msgstr "Instalar o Kubuntu"
+
+#: ../kubuntu-calamares.desktop.in.h:3
+msgid "Calamares — System Installer"
+msgstr "Calamares — Instalador do Sistema"
--- a/kubuntu/po/pt_BR.po
+++ b/kubuntu/po/pt_BR.po
@ -0,0 +1,27 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-07-10 02:36-0500\n"
+"PO-Revision-Date: 2024-02-05 00:00+0000\n"
+"Last-Translator: Aaron Rainbolt <arraybolt3@ubuntu.com>\n"
+"Language-Team: Portuguese (Brazil) <https://translate.lubuntu.me/projects/"
+"lubuntu/calamares-settings-lubuntu-desktop/pt_BR/>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 3.1-dev\n"
+
+#: ../kubuntu-calamares.desktop.in.h:1
+msgid "Install Kubuntu 24.04 LTS"
+msgstr "Instalar Kubuntu 24.04 LTS"
+
+#: ../kubuntu-calamares.desktop.in.h:2
+msgid "Install Kubuntu"
+msgstr "Instalar Kubuntu"
+
+#: ../kubuntu-calamares.desktop.in.h:3
+msgid "Calamares — System Installer"
+msgstr "Calamares — Instalador do sistema"
--- a/kubuntu/po/ru.po
+++ b/kubuntu/po/ru.po
@ -0,0 +1,30 @@
+# Base translation file for Lubuntu's Calamares settings
+# Copyright (C) 2018 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+# This file is distributed under the same license as the package.
+# Simon Quigley <tsimonq2@ubuntu.com>, 2018.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-07-10 02:36-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../kubuntu-calamares.desktop.in.h:1
+msgid "Install Kubuntu 24.04 LTS"
+msgstr ""
+
+#: ../kubuntu-calamares.desktop.in.h:2
+msgid "Install Kubuntu"
+msgstr ""
+
+#: ../kubuntu-calamares.desktop.in.h:3
+msgid "Calamares — System Installer"
+msgstr ""
--- a/kubuntu/po/zh-hans.po
+++ b/kubuntu/po/zh-hans.po
@ -0,0 +1,30 @@
+# Base translation file for Lubuntu's Calamares settings
+# Copyright (C) 2018 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+# This file is distributed under the same license as the package.
+# Simon Quigley <tsimonq2@ubuntu.com>, 2018.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-07-10 02:36-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../kubuntu-calamares.desktop.in.h:1
+msgid "Install Kubuntu 24.04 LTS"
+msgstr ""
+
+#: ../kubuntu-calamares.desktop.in.h:2
+msgid "Install Kubuntu"
+msgstr ""
+
+#: ../kubuntu-calamares.desktop.in.h:3
+msgid "Calamares — System Installer"
+msgstr ""
--- a/kubuntu/settings.conf
+++ b/kubuntu/settings.conf
@ -0,0 +1,70 @@
+---
+modules-search: [ local ]
+
+instances:
+- id: before_bootloader_mkdirs
+  module: contextualprocess
+  config: before_bootloader_mkdirs_context.conf
+- id: before_bootloader
+  module: contextualprocess
+  config: before_bootloader_context.conf
+- id: after_bootloader
+  module: contextualprocess
+  config: after_bootloader_context.conf
+- id: logs
+  module: shellprocess
+  config: shellprocess_logs.conf
+- id: bug-LP#1829805
+  module: shellprocess
+  config: shellprocess_bug-LP#1829805.conf
+- id: add386arch
+  module: shellprocess
+  config: shellprocess_add386arch.conf
+- id: oemprep
+  module: shellprocess
+  config: shellprocess_oemprep.conf
+
+sequence:
+- show:
+  - welcome
+  - locale
+  - keyboard
+  - partition
+  - users
+  - summary
+- exec:
+  - partition
+  - mount
+  - unpackfs
+  - machineid
+  - fstab
+  - locale
+  - keyboard
+  - localecfg
+  - luksbootkeyfile
+  - users
+  - displaymanager
+  - networkcfg
+  - hwclock
+  - contextualprocess@before_bootloader_mkdirs
+  - shellprocess@bug-LP#1829805
+  - initramfscfg
+  - initramfs
+  - grubcfg
+  - contextualprocess@before_bootloader
+  - bootloader
+  - contextualprocess@after_bootloader
+  - automirror
+  - shellprocess@add386arch
+  - packages
+  - shellprocess@logs
+  - umount
+- show:
+  - finished
+
+branding: kubuntu
+prompt-install: true
+dont-chroot: false
+oem-setup: false
+disable-cancel: false
+disable-cancel-during-exec: false
--- a/lubuntu/modules/partition.conf
+++ b/lubuntu/modules/partition.conf
@ -1,5 +1,6 @@
 efiSystemPartition: "/boot/efi"
 enableLuksAutomatedPartitioning: true
+luksGeneration: luks2
 userSwapChoices:
    - none
    - file
@ -7,3 +8,14 @@ initialSwapChoice: file
 drawNestedPartitions: true
 defaultFileSystemType: "ext4"
 availableFileSystemTypes: ["ext4","btrfs","xfs"]
+partitionLayout:
+    - name: "lubuntu_boot"
+      filesystem: ext4
+      noEncrypt: true
+      onlyPresentWithEncryption: true
+      mountPoint: "/boot"
+      size: 4G
+    - name: "lubuntu_2404"
+      filesystem: unknown
+      mountPoint: "/"
+      size: 100%