Fix theming, fix freeze when Calamares quits without reboot
This commit is contained in:
parent
e05ca8280e
commit
b372c48076
@ -58,7 +58,6 @@ install(PROGRAMS "scripts/change-system-language" DESTINATION libexec)
|
||||
install(PROGRAMS "scripts/lubuntu-installer" DESTINATION libexec)
|
||||
install(PROGRAMS "scripts/start-lubuntu-live-env" DESTINATION bin)
|
||||
install(FILES "lubuntu-live-environment.desktop" DESTINATION share/xsessions)
|
||||
install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink /etc/xdg/xdg-Lubuntu /etc/xdg/xdg-lubuntu-live-environment)")
|
||||
|
||||
if(QT_VERSION_MAJOR EQUAL 6)
|
||||
qt_finalize_executable(lubuntu-installer-prompt)
|
||||
|
@ -1,3 +1,3 @@
|
||||
#!/bin/bash
|
||||
|
||||
pkexec calamares -D6
|
||||
sudo -E calamares -D6
|
||||
|
@ -1,11 +1,11 @@
|
||||
#!/bin/bash
|
||||
# Starts the Lubuntu Live Environment.
|
||||
|
||||
openbox &
|
||||
sudo lubuntu-installer-prompt # This is intentionally *not* backgrounded.
|
||||
# If it exits...
|
||||
export XDG_CONFIG_DIRS="/etc/xdg/xdg-Lubuntu:"$XDG_CONFIG_DIRS
|
||||
export XDG_DATA_DIRS="/usr/share/Lubuntu:"$XDG_DATA_DIRS
|
||||
export DESKTOP_SESSION="Lubuntu"
|
||||
openbox &
|
||||
sudo lubuntu-installer-prompt # This is intentionally *not* backgrounded.
|
||||
# If it exits...
|
||||
killall openbox
|
||||
startlxqt
|
||||
|
@ -513,8 +513,7 @@ void InstallerPrompt::installLubuntu()
|
||||
calamares->start("/usr/libexec/lubuntu-installer", args);
|
||||
|
||||
// If Calamares exits, it either crashed or the user cancelled the installation. Exit the installer prompt (and start LXQt).
|
||||
connect(calamares, static_cast<void(QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
|
||||
this, [this](int, QProcess::ExitStatus){ this->tryLubuntu(); });
|
||||
connect(calamares, SIGNAL(finished(int)), this, SLOT(tryLubuntu()));
|
||||
}
|
||||
|
||||
InstallerPrompt::~InstallerPrompt()
|
||||
|
Loading…
x
Reference in New Issue
Block a user