[OEM] Ensure the final desktop file completing OEM is marked as executable.

This commit is contained in:
Simon Quigley 2025-04-12 22:04:30 -05:00
parent de24f68f2b
commit 133641b96c
5 changed files with 14 additions and 0 deletions

1
debian/changelog vendored
View File

@ -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 disabled, and Calamares shows up on the install list only for stacked
squashfses which have OEM enabled. This nuanced approach ensures all squashfses which have OEM enabled. This nuanced approach ensures all
potential combinations have the intended functionality. potential combinations have the intended functionality.
* [OEM] Ensure the final desktop file completing OEM is marked as executable.
-- Simon Quigley <tsimonq2@ubuntu.com> Sat, 12 Apr 2025 00:23:39 -0500 -- Simon Quigley <tsimonq2@ubuntu.com> Sat, 12 Apr 2025 00:23:39 -0500

1
debian/control vendored
View File

@ -75,6 +75,7 @@ Depends: calamares (>= 3.3.13-0ubuntu4),
dracut-core, dracut-core,
kdialog, kdialog,
keyutils, keyutils,
libglib2.0-bin,
snapd-seed-glue, snapd-seed-glue,
squashfs-tools, squashfs-tools,
sudo, sudo,

View File

@ -7,6 +7,10 @@
tar xvzf /etc/calamares/oemconfig.tar.gz -C "$1" --strip-components=2; tar xvzf /etc/calamares/oemconfig.tar.gz -C "$1" --strip-components=2;
chown -R 1000:1000 "$1"/home/oem 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 # 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 "$1"/etc/sudoers.orig
mv "$1"/etc/sudoers.oem "$1"/etc/sudoers mv "$1"/etc/sudoers.oem "$1"/etc/sudoers

View File

@ -7,6 +7,10 @@
tar xvzf /etc/calamares/oemconfig.tar.gz -C "$1" --strip-components=2; tar xvzf /etc/calamares/oemconfig.tar.gz -C "$1" --strip-components=2;
chown -R 1000:1000 "$1"/home/oem 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 # 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 "$1"/etc/sudoers.orig
mv "$1"/etc/sudoers.oem "$1"/etc/sudoers mv "$1"/etc/sudoers.oem "$1"/etc/sudoers

View File

@ -7,6 +7,10 @@
tar xvzf /etc/calamares/oemconfig.tar.gz -C "$1" --strip-components=2; tar xvzf /etc/calamares/oemconfig.tar.gz -C "$1" --strip-components=2;
chown -R 1000:1000 "$1"/home/oem 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 # 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 "$1"/etc/sudoers.orig
mv "$1"/etc/sudoers.oem "$1"/etc/sudoers mv "$1"/etc/sudoers.oem "$1"/etc/sudoers