diff --git a/debian/changelog b/debian/changelog index 93640c0..35b0086 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Wed, 09 Apr 2025 01:55:07 -0500 diff --git a/kubuntu/oem/calamares-launch-oem b/kubuntu/oem/calamares-launch-oem index fd4adc8..1fb44d1 100755 --- a/kubuntu/oem/calamares-launch-oem +++ b/kubuntu/oem/calamares-launch-oem @@ -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; diff --git a/lubuntu/oem/calamares-launch-oem b/lubuntu/oem/calamares-launch-oem index ac85ed1..961271b 100755 --- a/lubuntu/oem/calamares-launch-oem +++ b/lubuntu/oem/calamares-launch-oem @@ -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; diff --git a/ubuntuunity/oem/calamares-launch-oem b/ubuntuunity/oem/calamares-launch-oem index a5d6b74..02cbff8 100755 --- a/ubuntuunity/oem/calamares-launch-oem +++ b/ubuntuunity/oem/calamares-launch-oem @@ -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;