Lubuntu/calamares-settings-ubuntu
4
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-qt-code/+git/calamares-settings-ubuntu synced 2025-10-24 04:34:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Multiple bugfixes, mostly for Kubuntu

Browse Source
This commit is contained in:
Aaron Rainbolt 2025-09-25 13:58:34 -05:00
parent 554a4a891c
commit 53012aebf8
Signed by: arraybolt3
GPG Key ID: A709160D73C79109
21 changed files with 68 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -28,7 +28,7 @@ all:
(cp lubuntu/oem/calamares-finish-oem.desktop lubuntu/oemconfig/home/oem/Desktop/)
(fakeroot bash -c "chown -R root:root lubuntu/oemconfig && tar cvzf lubuntu/oemconfig.tar.gz lubuntu/oemconfig")
# 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 && mkdir -p home/oem/Desktop)
(cd kubuntu && mkdir oemconfig && cd oemconfig && mkdir -p usr/bin && mkdir -p etc/calamares && mkdir -p usr/share/wayland-sessions && mkdir -p usr/libexec && mkdir -p etc && mkdir -p usr/share/applications && mkdir -p home/oem/Desktop)
(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)
@ -38,8 +38,9 @@ all:
(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/kubuntu-oem-environment.desktop kubuntu/oemconfig/usr/share/wayland-sessions/)
(cp kubuntu/oem/kubuntu-oem-env/start-kubuntu-oem-env kubuntu/oemconfig/usr/libexec/)
(cp kubuntu/oem/kubuntu-oem-env/kubuntu-oem-env-shim kubuntu/oemconfig/usr/libexec/)
(cp common/basicwallpaper/build/basicwallpaper kubuntu/oemconfig/usr/bin/)
(cp kubuntu/oem/calamares-finish-oem.desktop kubuntu/oemconfig/home/oem/Desktop/)
(fakeroot bash -c "chown -R root:root kubuntu/oemconfig && tar cvzf kubuntu/oemconfig.tar.gz kubuntu/oemconfig")

2
common/basicwallpaper/mainwindow.ui
View File

@ -14,8 +14,6 @@
<string>MainWindow</string>
</property>
<widget class="QWidget" name="centralwidget"/>
<widget class="QMenuBar" name="menubar"/>
<widget class="QStatusBar" name="statusbar"/>
</widget>
<resources/>
<connections/>

14
debian/changelog vendored
View File

@ -1,3 +1,17 @@
calamares-settings-ubuntu (1:25.10.5) questing; urgency=medium
* Stop using "sudo -E" to launch things, sudo-rs now ignores it.
* Fix how Calamares is launched in the first-time user setup session on
Kubuntu. (LP: #2125435)
* Explicitly remove calamares-settings-ubuntu-common(-data) after
installation. (LP: #2125700)
* Prevent the user from skipping a system restart after first-time user
setup on Kubuntu.
* Fix a strange-looking horizontal black line being shown by BasicWallpaper
in the first-time user setup session.
-- Aaron Rainbolt <arraybolt3@ubuntu.com> Mon, 22 Sep 2025 13:43:26 -0500
calamares-settings-ubuntu (1:25.10.4) questing; urgency=medium
* Don't try to uninstall packages to make a minimal system when stacked

2
kubuntu/kubuntu-calamares.desktop.in
View File

@ -3,7 +3,7 @@ Type=Application
Version=1.0
_Name=Install Kubuntu 25.10
_GenericName=Install Kubuntu
Exec=sudo -E /usr/bin/calamares-launch-normal
Exec=sudo /usr/bin/calamares-launch-normal
_Comment=Calamares — System Installer
Icon=system-software-install
Terminal=false

2
kubuntu/modules/packages.conf
View File

@ -4,6 +4,8 @@ operations:
- remove:
- "^live-*"
- calamares-settings-kubuntu
- calamares-settings-ubuntu-common
- calamares-settings-ubuntu-common-data
- calamares
- cifs-utils
- kubuntu-installer-prompt

18
kubuntu/oem/calamares-launch-oem
View File

@ -4,7 +4,7 @@
if [ -e '/etc/calamares/OEM_MODE_ACTIVATED' ]; then
export BROWSER='sudo -H -u kubuntu firefox'
calamares -D8;
sudo BROWSER="${BROWSER}" calamares -D8;
exit;
fi
@ -20,28 +20,28 @@ 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;
sudo 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;
sudo 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;
sudo sed -i "/- welcome$/a \ \ - oemid" /etc/calamares/settings.conf;
# Enable OEM prep module
sed -i "/- packages$/a \ \ - shellprocess@oemprep" /etc/calamares/settings.conf;
sudo sed -i "/- packages$/a \ \ - shellprocess@oemprep" /etc/calamares/settings.conf;
# Fix OEM UID
sed -i "/- shellprocess@oemprep$/a \ \ - shellprocess@fix-oem-uid" /etc/calamares/settings.conf;
sudo sed -i "/- shellprocess@oemprep$/a \ \ - shellprocess@fix-oem-uid" /etc/calamares/settings.conf;
# Force the user of an OEM configuration user
cp /etc/calamares/modules/users.conf.oem /etc/calamares/modules/users.conf;
sudo 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;
sudo touch /etc/calamares/OEM_MODE_ACTIVATED;
# Launch Calamares
export BROWSER='sudo -H -u kubuntu firefox'
calamares -D8;
sudo BROWSER="${BROWSER}" calamares -D8;
fi

2
kubuntu/oem/calamares-launch-oem.desktop
View File

@ -2,7 +2,7 @@
Type=Application
Version=1.0
Name=Install Kubuntu 25.10 (OEM mode)
Exec=sudo -E /usr/bin/calamares-launch-oem
Exec=/usr/bin/calamares-launch-oem
Icon=system-software-install
Terminal=false
StartupNotify=true

2
kubuntu/oem/calamares-oemfinish.sh
View File

@ -2,6 +2,6 @@
#
# 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 /usr/share/xsessions/kubuntu-oem-environment.desktop /usr/libexec/start-kubuntu-oem-env /etc/sudoers /usr/bin/calamares-logs-helper /usr/libexec/calamares-oemfinish.sh
rm -rf /etc/calamares /usr/bin/basicwallpaper /usr/bin/calamares-finish-oem /usr/share/applications/calamares-finish-oem.desktop /usr/share/wayland-sessions/kubuntu-oem-environment.desktop /usr/libexec/start-kubuntu-oem-env /usr/libexec/kubuntu-oem-env-shim /etc/sudoers /usr/bin/calamares-logs-helper /usr/libexec/calamares-oemfinish.sh
mv /etc/sudoers.orig /etc/sudoers

7
kubuntu/oem/kubuntu-oem-env/kubuntu-oem-env-shim Executable file
View File

@ -0,0 +1,7 @@
#!/bin/bash
# This script only exists so that we can pass multiple commands and their arguments to kwin_wayland.
/usr/bin/basicwallpaper /usr/share/wallpapers/Next/contents/images/5120x2880.png &
xhost si:localuser:root
sudo QT_QPA_PLATFORMTHEME=kde /usr/bin/calamares -D8

8
kubuntu/oem/kubuntu-oem-env/start-kubuntu-oem-env
View File

@ -6,10 +6,4 @@ export DESKTOP_SESSION="plasma"
export QT_QPA_PLATFORMTHEME="kde"
export BROWSER='sudo -H -u kubuntu firefox'
/usr/bin/kwin_wayland --no-lockscreen &
while [ ! -e "/run/user/$(id -u)/wayland-0" ]; do sleep 1; done
/usr/bin/basicwallpaper /usr/share/wallpapers/Next/contents/3840x2160.png &
WAYLAND_DISPLAY="wayland-0" sudo -E /usr/bin/calamares -D8 # This is intentionally *not* backgrounded.
# If it exits...
killall basicwallpaper
killall kwin_wayland
/usr/bin/kwin_wayland --no-lockscreen --xwayland /usr/libexec/kubuntu-oem-env-shim

2
kubuntu/oem/modules/finished.conf
View File

@ -1,3 +1,3 @@
---
restartNowMode: user-checked
restartNowMode: always
restartNowCommand: "systemctl -i reboot"

2
lubuntu/lubuntu-calamares.desktop.in
View File

@ -3,7 +3,7 @@ Type=Application
Version=1.0
_Name=Install Lubuntu 25.10
_GenericName=Install Lubuntu
Exec=sudo -E /usr/bin/calamares-launch-normal
Exec=sudo /usr/bin/calamares-launch-normal
_Comment=Calamares — System Installer
Icon=lubuntu-installer
Terminal=false

2
lubuntu/modules/packages.conf
View File

@ -4,6 +4,8 @@ operations:
- remove:
- "^live-*"
- calamares-settings-lubuntu
- calamares-settings-ubuntu-common
- calamares-settings-ubuntu-common-data
- calamares
- zram-config
- cifs-utils

18
lubuntu/oem/calamares-launch-oem
View File

@ -4,7 +4,7 @@
if [ -e '/etc/calamares/OEM_MODE_ACTIVATED' ]; then
export BROWSER='sudo -H -u lubuntu firefox'
calamares -D8;
sudo BROWSER="${BROWSER}" calamares -D8;
exit;
fi
@ -20,28 +20,28 @@ EOL
if kdialog --warningyesno "${msg}"; then
# Tweak branding to make it clear that OEM installation mode is active
cp /etc/calamares/branding/lubuntu/welcome-oem.png /etc/calamares/branding/lubuntu/welcome.png;
sudo cp /etc/calamares/branding/lubuntu/welcome-oem.png /etc/calamares/branding/lubuntu/welcome.png;
# Don't remove Calamares from the installed system.
sed -i '/- calamares$/d' /etc/calamares/modules/packages.conf;
sudo 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;
sudo sed -i "/- welcome$/a \ \ - oemid" /etc/calamares/settings.conf;
# Enable OEM prep module
sed -i "/- packages$/a \ \ - shellprocess@oemprep" /etc/calamares/settings.conf;
sudo sed -i "/- packages$/a \ \ - shellprocess@oemprep" /etc/calamares/settings.conf;
# Fix OEM UID
sed -i "/- shellprocess@oemprep$/a \ \ - shellprocess@fix-oem-uid" /etc/calamares/settings.conf;
sudo sed -i "/- shellprocess@oemprep$/a \ \ - shellprocess@fix-oem-uid" /etc/calamares/settings.conf;
# Force the user of an OEM configuration user
cp /etc/calamares/modules/users.conf.oem /etc/calamares/modules/users.conf;
sudo 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;
sudo touch /etc/calamares/OEM_MODE_ACTIVATED;
# Launch Calamares
export BROWSER='sudo -H -u lubuntu firefox'
calamares -D8;
sudo BROWSER="${BROWSER}" calamares -D8;
fi

2
lubuntu/oem/calamares-launch-oem.desktop
View File

@ -2,7 +2,7 @@
Type=Application
Version=1.0
Name=Install Lubuntu 25.10 (OEM mode)
Exec=sudo -E /usr/bin/calamares-launch-oem
Exec=/usr/bin/calamares-launch-oem
Icon=system-software-install
Terminal=false
StartupNotify=true

2
lubuntu/oem/lubuntu-oem-env/start-lubuntu-oem-env
View File

@ -13,7 +13,7 @@ export BROWSER='sudo -H -u lubuntu firefox'
/usr/bin/openbox &
/usr/bin/basicwallpaper /usr/share/lubuntu/wallpapers/lubuntu-default-wallpaper.png &
sudo -E /usr/bin/calamares -D8 # This is intentionally *not* backgrounded.
sudo /usr/bin/calamares -D8 # This is intentionally *not* backgrounded.
# If it exits...
killall basicwallpaper
killall openbox

2
ubuntuunity/modules/packages.conf
View File

@ -4,6 +4,8 @@ operations:
- remove:
- "^live-*"
- calamares-settings-ubuntu-unity
- calamares-settings-ubuntu-common
- calamares-settings-ubuntu-common-data
- calamares
- cifs-utils
- try_install:

18
ubuntuunity/oem/calamares-launch-oem
View File

@ -4,7 +4,7 @@
if [ -e '/etc/calamares/OEM_MODE_ACTIVATED' ]; then
export BROWSER='sudo -H -u ubuntu-unity firefox'
QT_STYLE_OVERRIDE=kvantum calamares -D8;
sudo BROWSER="${BROWSER}" QT_STYLE_OVERRIDE=kvantum calamares -D8;
exit;
fi
@ -17,28 +17,28 @@ EOL
if zenity --question --text="${msg}"; then
# Tweak branding to make it clear that OEM installation mode is active
cp /etc/calamares/branding/ubuntuunity/welcome-oem.png /etc/calamares/branding/ubuntuunity/welcome.png;
sudo cp /etc/calamares/branding/ubuntuunity/welcome-oem.png /etc/calamares/branding/ubuntuunity/welcome.png;
# Don't remove Calamares from the installed system.
sed -i '/- calamares$/d' /etc/calamares/modules/packages.conf;
sudo 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;
sudo sed -i "/- welcome$/a \ \ - oemid" /etc/calamares/settings.conf;
# Enable OEM prep module
sed -i "/- packages$/a \ \ - shellprocess@oemprep" /etc/calamares/settings.conf;
sudo sed -i "/- packages$/a \ \ - shellprocess@oemprep" /etc/calamares/settings.conf;
# Fix OEM UID
sed -i "/- shellprocess@oemprep$/a \ \ - shellprocess@fix-oem-uid" /etc/calamares/settings.conf;
sudo sed -i "/- shellprocess@oemprep$/a \ \ - shellprocess@fix-oem-uid" /etc/calamares/settings.conf;
# Force the user of an OEM configuration user
cp /etc/calamares/modules/users.conf.oem /etc/calamares/modules/users.conf;
sudo 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;
sudo touch /etc/calamares/OEM_MODE_ACTIVATED;
# Launch Calamares
export BROWSER='sudo -H -u ubuntu-unity firefox'
QT_STYLE_OVERRIDE=kvantum calamares -D8;
sudo BROWSER="${BROWSER}" QT_STYLE_OVERRIDE=kvantum calamares -D8;
fi

2
ubuntuunity/oem/calamares-launch-oem.desktop
View File

@ -2,7 +2,7 @@
Type=Application
Version=1.0
Name=Install Ubuntu Unity 25.10 (OEM mode)
Exec=sudo -E /usr/bin/calamares-launch-oem
Exec=/usr/bin/calamares-launch-oem
Icon=ubuntu-unity-installer
Terminal=false
StartupNotify=true

2
ubuntuunity/oem/ubuntu-unity-oem-env/start-ubuntu-unity-oem-env
View File

@ -6,7 +6,7 @@ export BROWSER='sudo -H -u ubuntu-unity firefox'
/usr/bin/xfwm4 &
/usr/bin/basicwallpaper /usr/share/backgrounds/ubuntu-unity/ubuntu-unity-default.png &
sudo -E /usr/bin/calamares -D8 # This is intentionally *not* backgrounded.
sudo /usr/bin/calamares -D8 # This is intentionally *not* backgrounded.
# If it exits...
pkill -9 basicwallpaper
pkill -9 xfconfd

2
ubuntuunity/ubuntu-unity-calamares.desktop.in
View File

@ -3,7 +3,7 @@ Type=Application
Version=1.0
_Name=Install Ubuntu Unity 25.10
_GenericName=Install Ubuntu Unity
Exec=sudo -E /usr/bin/calamares-launch-normal
Exec=sudo /usr/bin/calamares-launch-normal
_Comment=Calamares — System Installer
Icon=ubuntu-unity-installer
Terminal=false