[OEM] Ensure OEM processing is ran, now that pkgselectprocess exists

As a temporary stop-gap until this can be completely re-written next cycle,
ensure the sed call in the Calamares OEM setup refers to pkgselectprocess,
not packages. This was preventing the OEM processing step (as opposed to just
the GUI configuration) to be missing (LP: #2104343).
This commit is contained in:
Simon Quigley 2025-04-09 05:00:19 -05:00
parent 68b993050c
commit 7ba422ace8
4 changed files with 8 additions and 3 deletions

5
debian/changelog vendored
View File

@ -6,6 +6,11 @@ calamares-settings-ubuntu (1:25.04.24) UNRELEASED; urgency=medium
exists so it can be used in the install process. This fixes installation
of the Virtual Machine Manager when selected on the Customize menu
(LP: #2104243).
* [OEM] As a temporary stop-gap until this can be completely re-written next
cycle, ensure the sed call in the Calamares OEM setup refers to
pkgselectprocess, not packages. This was preventing the OEM processing
step (as opposed to just the GUI configuration) to be missing
(LP: #2104343).
-- Simon Quigley <tsimonq2@ubuntu.com> Wed, 09 Apr 2025 01:55:07 -0500

View File

@ -29,7 +29,7 @@ if kdialog --warningyesno "${msg}"; then
sed -i "/- welcome$/a \ \ - oemid" /etc/calamares/settings.conf;
# Enable OEM prep module
sed -i "/- packages$/a \ \ - shellprocess@oemprep" /etc/calamares/settings.conf;
sed -i "/- pkgselectprocess$/a \ \ - shellprocess@oemprep" /etc/calamares/settings.conf;
# Fix OEM UID
sed -i "/- shellprocess@oemprep$/a \ \ - shellprocess@fix-oem-uid" /etc/calamares/settings.conf;

View File

@ -29,7 +29,7 @@ if kdialog --warningyesno "${msg}"; then
sed -i "/- welcome$/a \ \ - oemid" /etc/calamares/settings.conf;
# Enable OEM prep module
sed -i "/- packages$/a \ \ - shellprocess@oemprep" /etc/calamares/settings.conf;
sed -i "/- pkgselectprocess$/a \ \ - shellprocess@oemprep" /etc/calamares/settings.conf;
# Fix OEM UID
sed -i "/- shellprocess@oemprep$/a \ \ - shellprocess@fix-oem-uid" /etc/calamares/settings.conf;

View File

@ -26,7 +26,7 @@ if zenity --question --text="${msg}"; then
sed -i "/- welcome$/a \ \ - oemid" /etc/calamares/settings.conf;
# Enable OEM prep module
sed -i "/- packages$/a \ \ - shellprocess@oemprep" /etc/calamares/settings.conf;
sed -i "/- pkgselectprocess$/a \ \ - shellprocess@oemprep" /etc/calamares/settings.conf;
# Fix OEM UID
sed -i "/- shellprocess@oemprep$/a \ \ - shellprocess@fix-oem-uid" /etc/calamares/settings.conf;