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

[pkgselectprocess] Disable the dpkg trigger inhibition logic this cycle. The original goal here was to de-duplicate some of the trigger processing work, but it's obvious this needs more work. It's too premature to ship right now, unfortunately.

Browse Source
This commit is contained in:
Simon Quigley 2025-04-09 05:59:49 -05:00
parent 71f067fbba
commit d6ff965abb
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/modules/pkgselectprocess/PackageSelectProcess.cpp
View File

@ -324,12 +324,14 @@ Calamares::JobResult PackageSelectProcess::exec()
} }
// Add diversions for dracut, update-initramfs, and locale-gen // Add diversions for dracut, update-initramfs, and locale-gen
/*
dpkgDiversions = { dpkgDiversions = {
{"dracut", "/usr/bin/dracut"}, {"dracut", "/usr/bin/dracut"},
{"update-initramfs", "/usr/sbin/update-initramfs"}, {"update-initramfs", "/usr/sbin/update-initramfs"},
{"locale-gen", "/usr/sbin/locale-gen"} {"locale-gen", "/usr/sbin/locale-gen"}
}; };
divert(true); divert(true);
*/
double installStart; double installStart;
double installEnd; double installEnd;
@ -363,6 +365,19 @@ Calamares::JobResult PackageSelectProcess::exec()
const QString checkpackage_path = "/usr/libexec/checkpackage-backend"; const QString checkpackage_path = "/usr/libexec/checkpackage-backend";
const QString chroot_checkpackage_path = rootMountPoint + checkpackage_path; const QString chroot_checkpackage_path = rootMountPoint + checkpackage_path;
// As part of the fix for LP: #2104343, we need to ensure that, if
// we are currently in OEM mode, Calamares and friends remain
// installed. During stage two, we clean it up.
// FIXME: When the OEM stack is rewritten in 25.10, this needs to be
// rewritten.
if (QFile::exists("/etc/calamares/OEM_MODE_ACTIVATED")) {
QStringList wip_list;
for (auto debPackage : debPackages) {
if (!debPackage.contains(QString("calamares"))) wip_list << debPackage;
}
debPackages = wip_list;
}
// checkpackage-backend needs to be explicitly copied to the chroot // checkpackage-backend needs to be explicitly copied to the chroot
// and removed later for systems with stacked squashfses, or the // and removed later for systems with stacked squashfses, or the
// install command will fail. LP: #2104243 // install command will fail. LP: #2104243
@ -419,7 +434,7 @@ Calamares::JobResult PackageSelectProcess::exec()
true); true);
// Disable diversions // Disable diversions
divert(false); //divert(false);
// Handle snap packages // Handle snap packages
if (installationMode != "minimal") { if (installationMode != "minimal") {

4
debian/changelog vendored
View File

@ -13,6 +13,10 @@ calamares-settings-ubuntu (1:25.04.24) UNRELEASED; urgency=medium
(LP: #2104343). (LP: #2104343).
* [OEM] [Kubuntu] In stage two, ensure we use Wayland, consistent with the * [OEM] [Kubuntu] In stage two, ensure we use Wayland, consistent with the
rest of the session scripts. rest of the session scripts.
* [pkgselectprocess] Disable the dpkg trigger inhibition logic this cycle.
The original goal here was to de-duplicate some of the trigger processing
work, but it's obvious this needs more work. It's too premature to ship
right now, unfortunately.
-- Simon Quigley <tsimonq2@ubuntu.com> Wed, 09 Apr 2025 01:55:07 -0500 -- Simon Quigley <tsimonq2@ubuntu.com> Wed, 09 Apr 2025 01:55:07 -0500