From 133641b96c918860295185eec6aed6ceafcf7d77 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Sat, 12 Apr 2025 22:04:30 -0500 Subject: [PATCH] [OEM] Ensure the final desktop file completing OEM is marked as executable. --- debian/changelog | 1 + debian/control | 1 + kubuntu/oem/calamares-oemprep.sh | 4 ++++ lubuntu/oem/calamares-oemprep.sh | 4 ++++ ubuntuunity/oem/calamares-oemprep.sh | 4 ++++ 5 files changed, 14 insertions(+) diff --git a/debian/changelog b/debian/changelog index 04536b6..27830bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ calamares-settings-ubuntu (1:25.04.25) UNRELEASED; urgency=medium disabled, and Calamares shows up on the install list only for stacked squashfses which have OEM enabled. This nuanced approach ensures all potential combinations have the intended functionality. + * [OEM] Ensure the final desktop file completing OEM is marked as executable. -- Simon Quigley Sat, 12 Apr 2025 00:23:39 -0500 diff --git a/debian/control b/debian/control index 712b4fc..9ce53fa 100644 --- a/debian/control +++ b/debian/control @@ -75,6 +75,7 @@ Depends: calamares (>= 3.3.13-0ubuntu4), dracut-core, kdialog, keyutils, + libglib2.0-bin, snapd-seed-glue, squashfs-tools, sudo, diff --git a/kubuntu/oem/calamares-oemprep.sh b/kubuntu/oem/calamares-oemprep.sh index 3d44716..eeec699 100755 --- a/kubuntu/oem/calamares-oemprep.sh +++ b/kubuntu/oem/calamares-oemprep.sh @@ -7,6 +7,10 @@ tar xvzf /etc/calamares/oemconfig.tar.gz -C "$1" --strip-components=2; chown -R 1000:1000 "$1"/home/oem +# Ensure the desktop file is marked as trusted +# See line 96 of scripts/casper-bottom/25adduser in src:casper as shipped in Plucky +gio set /home/oem/Desktop/calamares-finish-oem.desktop metadata::trusted true + # 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 diff --git a/lubuntu/oem/calamares-oemprep.sh b/lubuntu/oem/calamares-oemprep.sh index 3d44716..eeec699 100755 --- a/lubuntu/oem/calamares-oemprep.sh +++ b/lubuntu/oem/calamares-oemprep.sh @@ -7,6 +7,10 @@ tar xvzf /etc/calamares/oemconfig.tar.gz -C "$1" --strip-components=2; chown -R 1000:1000 "$1"/home/oem +# Ensure the desktop file is marked as trusted +# See line 96 of scripts/casper-bottom/25adduser in src:casper as shipped in Plucky +gio set /home/oem/Desktop/calamares-finish-oem.desktop metadata::trusted true + # 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 diff --git a/ubuntuunity/oem/calamares-oemprep.sh b/ubuntuunity/oem/calamares-oemprep.sh index 3d44716..eeec699 100755 --- a/ubuntuunity/oem/calamares-oemprep.sh +++ b/ubuntuunity/oem/calamares-oemprep.sh @@ -7,6 +7,10 @@ tar xvzf /etc/calamares/oemconfig.tar.gz -C "$1" --strip-components=2; chown -R 1000:1000 "$1"/home/oem +# Ensure the desktop file is marked as trusted +# See line 96 of scripts/casper-bottom/25adduser in src:casper as shipped in Plucky +gio set /home/oem/Desktop/calamares-finish-oem.desktop metadata::trusted true + # 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