mirror of
https://git.launchpad.net/~ubuntu-qt-code/+git/calamares-settings-ubuntu
synced 2025-12-26 11:33:33 +00:00
Fix Lubuntu installation issues stemming from pkgselect problems
This commit is contained in:
parent
69a33c1fe9
commit
554a4a891c
@ -5,6 +5,7 @@
|
|||||||
#include "network/Manager.h"
|
#include "network/Manager.h"
|
||||||
|
|
||||||
#include <QVariantMap>
|
#include <QVariantMap>
|
||||||
|
#include <QFile>
|
||||||
|
|
||||||
PackageSelectViewStep::PackageSelectViewStep( QObject* parent )
|
PackageSelectViewStep::PackageSelectViewStep( QObject* parent )
|
||||||
: Calamares::ViewStep( parent ),
|
: Calamares::ViewStep( parent ),
|
||||||
@ -33,7 +34,7 @@ bool PackageSelectViewStep::exists_and_true(const QString& key) const
|
|||||||
}
|
}
|
||||||
|
|
||||||
QWidget* PackageSelectViewStep::widget()
|
QWidget* PackageSelectViewStep::widget()
|
||||||
{
|
{
|
||||||
return m_widget;
|
return m_widget;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -187,6 +188,22 @@ PackageSelectViewStep::onLeave()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
gs->insert("packages", config);
|
gs->insert("packages", config);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This is a hack; a config file would be the right way to specify whether
|
||||||
|
* the distribution we're running on uses stacked squashfses or not. That
|
||||||
|
* being said, pulling in the full config framework for this would be
|
||||||
|
* overkill at the moment, so we're just using a flag file for this. If we
|
||||||
|
* ever need more than this, we should use Calamares' configuration
|
||||||
|
* framework instead.
|
||||||
|
*/
|
||||||
|
if (QFile::exists("/etc/calamares/modules/stacked_squashfs.flag")) {
|
||||||
|
if (!ui->minimal_button->isChecked()) {
|
||||||
|
QVariantMap enableAllUnpack;
|
||||||
|
enableAllUnpack.insert("unpack_regular", true);
|
||||||
|
gs->insert("installation_data", enableAllUnpack);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void PackageSelectViewStep::updatePackageSelections(bool checked) {
|
void PackageSelectViewStep::updatePackageSelections(bool checked) {
|
||||||
|
|||||||
9
debian/changelog
vendored
9
debian/changelog
vendored
@ -1,3 +1,12 @@
|
|||||||
|
calamares-settings-ubuntu (1:25.10.4) questing; urgency=medium
|
||||||
|
|
||||||
|
* Don't try to uninstall packages to make a minimal system when stacked
|
||||||
|
squashfses are in use. (LP: #2121435)
|
||||||
|
* Unpack the second squashfs when doing non-minimal installs when stacked
|
||||||
|
squashfses are in use. (LP: #2121155)
|
||||||
|
|
||||||
|
-- Aaron Rainbolt <arraybolt3@ubuntu.com> Tue, 26 Aug 2025 17:21:35 -0500
|
||||||
|
|
||||||
calamares-settings-ubuntu (1:25.10.3) questing; urgency=medium
|
calamares-settings-ubuntu (1:25.10.3) questing; urgency=medium
|
||||||
|
|
||||||
* Fix an FTBFS on riscv64 by disabling CGO on that platform.
|
* Fix an FTBFS on riscv64 by disabling CGO on that platform.
|
||||||
|
|||||||
@ -1,19 +1,15 @@
|
|||||||
---
|
---
|
||||||
dontChroot: false
|
dontChroot: false
|
||||||
timeout: 10800
|
timeout: 10800
|
||||||
"packages.minimalButton":
|
|
||||||
true:
|
|
||||||
- "DEBIAN_FRONTEND=noninteractive apt-get -y --purge remove snapd lubuntu-snap-installation-monitor vlc plasma-discover transmission-qt quassel 2048-qt featherpad noblenote kcalc qps zsync partitionmanager qapt-deb-installer picom qlipper qtpass libreoffice*"
|
|
||||||
- "apt-get -y autoremove"
|
|
||||||
"packages.partyButton":
|
"packages.partyButton":
|
||||||
true:
|
true:
|
||||||
- "DEBIAN_FRONTEND=noninteractive apt-get update"
|
- "DEBIAN_FRONTEND=noninteractive apt-get update"
|
||||||
- "DEBIAN_FRONTEND=noninteractive apt-get -y install ubuntu-restricted-addons unrar"
|
- "DEBIAN_FRONTEND=noninteractive apt-get -y install ubuntu-restricted-addons unrar"
|
||||||
"packages.updatesButton":
|
"packages.updatesButton":
|
||||||
true:
|
true:
|
||||||
- "DEBIAN_FRONTEND=noninteractive apt-get update"
|
- "DEBIAN_FRONTEND=noninteractive apt-get update"
|
||||||
- "DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::='--force-confnew' full-upgrade"
|
- "DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::='--force-confnew' full-upgrade"
|
||||||
"packages.virtmanagerButton":
|
"packages.virtmanagerButton":
|
||||||
true:
|
true:
|
||||||
- "DEBIAN_FRONTEND=noninteractive apt-get update"
|
- "DEBIAN_FRONTEND=noninteractive apt-get update"
|
||||||
- "DEBIAN_FRONTEND=noninteractive apt-get -y install virt-manager"
|
- "DEBIAN_FRONTEND=noninteractive apt-get -y install virt-manager"
|
||||||
|
|||||||
3
lubuntu/modules/stacked_squashfs.flag
Normal file
3
lubuntu/modules/stacked_squashfs.flag
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
This file exists to indicate to Calamares that the OS image it is running on
|
||||||
|
uses stacked squashfses. It is necessary for Calamares to unpack all
|
||||||
|
applicable squashfses when doing a non-minimal install.
|
||||||
Loading…
x
Reference in New Issue
Block a user