New build

Author: AdrianTM

debian/changelog

@@ -1,3 +1,10 @@
+mx-boot-options (24.9) mx; urgency=medium
+
+  * When running Live prompt to change live boot options or chroot to an installed system
+  * Change syslinux.cfg and isolinux.cfg when running Live
+
+ -- Adrian <[email protected]>  Mon, 02 Sep 2024 21:10:05 -0400
+
 mx-boot-options (24.6) mx; urgency=medium
 
   * Fix: setting GRUB background photo

debs/mx-boot-options_24.6.dsc

@@ -0,0 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+Format: 3.0 (native)
+Source: mx-boot-options
+Binary: mx-boot-options
+Architecture: any
+Version: 24.9
+Maintainer: Adrian <[email protected]>
+Standards-Version: 3.9.8
+Build-Depends: debhelper (>= 10), qtbase5-dev, qttools5-dev-tools
+Package-List:
+ mx-boot-options deb admin optional arch=any
+Checksums-Sha1:
+ 8c09601ab3346b0d1651ee39366abfcf653ec0c8 188556 mx-boot-options_24.9.tar.xz
+Checksums-Sha256:
+ 43a5477c7da9f8e831fa18023a4f7afec2b8ce2a6a441b223c7085365fc33d00 188556 mx-boot-options_24.9.tar.xz
+Files:
+ decfa580a087f9a561749eda38b920e0 188556 mx-boot-options_24.9.tar.xz
+
+-----BEGIN PGP SIGNATURE-----
+
+iQFHBAEBCgAxFiEE8ndToY6S45N+YzXncJOMeAZ57pgFAmbWYokTHGFkcmlhbkBt
+eGxpbnV4Lm9yZwAKCRBwk4x4BnnumIk7B/9/+/LjxHLhCyLv9AWdUOEnCNIJ/wil
+vZUZKf5C8GWlD5EY07dnEuMiRb/qTAeO1aYVJIQz3vasQv9LmbxOGj9cRjbfn1n4
+9zEufUoivc8bOWWiga+mxMQGP8s2InkuXD5ZGh9E1aFthOLGnvudq4ERG3tQH508
+Ux8Wxsrjbsj7TYn+ifnmsTcPRymKDhOFCePWHZo4J+K1qahZbglSR1Qw2H8+Don6
+JIGssMDGq1xTwjS3zkivEq29kiFJ/FHK3/CPT5oLvo82vOu3NAy0yq+/Emnf/nmU
+qvP3xCBEnkkICLxCHlTt+m63O8MBIMArh/LxTtYnX+ukR1JADrdnrqIP
+=2iAy
+-----END PGP SIGNATURE-----

debs/mx-boot-options_24.6.tar.xz

@@ -120,11 +120,23 @@ void MainWindow::setup()
     ui->pushThemeFile->setVisible(grubThemesExist);
     ui->pushThemeFile->setDisabled(true);
 
-    // If running live, read Linux partitions and set chroot on the selected one
+    // If running live, prompt user to choose between changing options for the live system or the installed system
     if (live) {
-        QString part = selectPartiton(getLinuxPartitions());
-        if (!part.isEmpty()) {
-            createChrootEnv(part);
+        QMessageBox msgBox(this);
+        msgBox.setWindowTitle(tr("Live System Detected"));
+        msgBox.setText(tr("You are currently running a live system. Would you like to modify the boot options for the live system "
+                          "or for an installed system?"));
+        QPushButton *liveButton = msgBox.addButton(tr("Live System"), QMessageBox::ActionRole);
+        QPushButton *installedButton = msgBox.addButton(tr("Installed System"), QMessageBox::ActionRole);
+        msgBox.exec();
+
+        if (msgBox.clickedButton() == installedButton) {
+            QString partition = selectPartiton(getLinuxPartitions());
+            if (!partition.isEmpty()) {
+                createChrootEnv(partition);
+            }
+        } else if (msgBox.clickedButton() == liveButton) {
+            boot_location = QFileInfo::exists("/live/config/did-toram") ? "/live/to-ram" : "/live/boot-dev";
         }
     }
 
@@ -665,6 +677,68 @@ bool MainWindow::replaceGrubArg(const QString &key, const QString &item)
     return replaced;         // Return whether a replacement occurred
 }
 
+void MainWindow::replaceSyslinuxArg(const QString &args)
+{
+    const QStringList configFiles
+        = {boot_location + "/boot/syslinux/syslinux.cfg", boot_location + "/boot/isolinux/isolinux.cfg"};
+
+    for (const QString &configFile : configFiles) {
+        QFile file(configFile);
+        if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+            qWarning() << "Failed to open" << configFile << "for reading.";
+            continue;
+        }
+
+        QStringList new_list;
+        bool replaced = false;
+
+        while (!file.atEnd()) {
+            QString line = file.readLine().trimmed();
+            if (!kernel_options.isEmpty() && line.contains(kernel_options)) {
+                line.replace(kernel_options, args);
+                replaced = true;
+            } else if (kernel_options.isEmpty() && line.startsWith("APPEND") && !replaced) {
+                QStringList parts = line.split(' ', Qt::SkipEmptyParts);
+                if (parts.size() > 1) {
+                    parts[1] = args;
+                } else {
+                    parts.append(args);
+                }
+                line = parts.join(' ');
+                replaced = true;
+            }
+            new_list << line;
+        }
+
+        file.close();
+
+        if (!replaced) {
+            qWarning() << "No" << (kernel_options.isEmpty() ? "APPEND line" : kernel_options) << "found to replace in"
+                       << configFile << ".";
+            continue;
+        }
+
+        // Write to a temporary file using QTemporaryFile
+        QTemporaryFile tempFile(QDir::tempPath() + "/XXXXXX.tmp");
+        if (!tempFile.open()) {
+            qWarning() << "Failed to open temporary file for writing.";
+            continue;
+        }
+
+        QTextStream stream(&tempFile);
+        stream.setCodec("UTF-8");
+        stream << new_list.join("\n") << "\n";
+        tempFile.flush();
+        tempFile.close();
+
+        // Move the temporary file to the original file
+        QString tempFilePath = tempFile.fileName();
+        if (!cmd.runAsRoot("mv " + tempFilePath + " " + configFile)) {
+            qWarning() << "Failed to move" << tempFilePath << "to" << configFile << ".";
+        }
+    }
+}
+
 void MainWindow::readGrubCfg()
 {
     QStringList content;
@@ -759,7 +833,7 @@ void MainWindow::readDefaultGrub()
             ui->pushBgFile->setDisabled(themeExists);
         } else if (line.startsWith("GRUB_CMDLINE_LINUX_DEFAULT=")) {
             QString cmdline = line.remove("GRUB_CMDLINE_LINUX_DEFAULT=").remove("\"").remove("'");
-            ui->textKernel->setText(cmdline);
+            ui->textKernel->setText(live ? kernel_options : cmdline);
             ui->radioLimitedMsg->setChecked(cmdline.contains("hush"));
             ui->radioDetailedMsg->setChecked(cmdline.contains("quiet"));
             ui->radioVeryDetailedMsg->setChecked(!cmdline.contains("hush") && !cmdline.contains("quiet"));
@@ -775,14 +849,14 @@ void MainWindow::readDefaultGrub()
 }
 
 // Read kernel line and options from /proc/cmdline
-void MainWindow::readKernelOpts()
+QString MainWindow::readKernelOpts()
 {
     QFile file("/proc/cmdline");
     if (!file.open(QIODevice::ReadOnly)) {
         qWarning() << "Failed to open file:" << file.fileName() << "- Error:" << file.errorString();
-        return;
+        return {};
     }
-    kernel_options = file.readAll().trimmed();
+    return file.readAll().trimmed();
 }
 
 void MainWindow::cmdStart()
@@ -836,6 +910,9 @@ void MainWindow::pushApply_clicked()
 
     if (kernel_options_changed) {
         replaceGrubArg("GRUB_CMDLINE_LINUX_DEFAULT", "\"" + ui->textKernel->text() + "\"");
+        if (live) {
+            replaceSyslinuxArg(ui->textKernel->text());
+        }
     }
 
     if (options_changed) {
@@ -907,9 +984,15 @@ void MainWindow::pushApply_clicked()
             writeDefaultGrub();
             progress->setLabelText(tr("Updating grub..."));
             cmd.runAsRoot(chroot + "update-grub");
+            if (live) {
+                cmd.runAsRoot("cp /boot/grub/grub.cfg " + boot_location + "/boot/grub/grub.cfg");
+            }
         }
         progress->close();
-        QMessageBox::information(this, tr("Done"), tr("Changes have been successfully applied."));
+        QString message = live && boot_location == "/live/to-ram"
+            ? tr("You are currently running in live mode with the 'toram' option. Please remember to save the persistence file or remaster, otherwise any changes made will be lost.")
+            : tr("Your changes have been successfully applied.");
+        QMessageBox::information(this, tr("Operation Complete"), message);
     }
 
     // Reset change flags

debs/mx-boot-options_24.9.dsc

@@ -89,13 +89,15 @@ private slots:
     bool splash_changed {};
     bool live = isLive();
 
+    const QString kernel_options {readKernelOpts()};
+    QString boot_location;
     QString chroot;
-    QString kernel_options;
     QString user;
     QStringList default_grub;
     QStringList grub_cfg;
     QTemporaryDir tmpdir;
 
+    QString readKernelOpts();
     QString selectPartiton(const QStringList &list);
     QStringList getLinuxPartitions();
     bool inVirtualMachine();
@@ -121,7 +123,7 @@ private slots:
                          QStringList *bootorder);
     void readDefaultGrub();
     void readGrubCfg();
-    void readKernelOpts();
+    void replaceSyslinuxArg(const QString &args);
     void saveBootOrder(const QListWidget *list);
     void setGeneralConnections();
     void setup();