wifi fix és calamres

1 files changed, 8 insertions, 5 deletions

diff --git a/raveos-calamares-module/wifi/NetworkManager.cpp b/raveos-calamares-module/wifi/NetworkManager.cpp
index 94abe2b..b3b12c7 100644
--- a/raveos-calamares-module/wifi/NetworkManager.cpp
+++ b/raveos-calamares-module/wifi/NetworkManager.cpp
@@ -17,7 +17,10 @@
 
 typedef QMap<QString, QVariantMap> NMConnectionSettings;
 
-static const QString LOG_FILE = "/tmp/calamares-wifi.log";
+static QString logFile()
+{
+    return qEnvironmentVariable("RAVEOS_WIFI_LOG", QStringLiteral("/tmp/calamares-wifi.log"));
+}
 
 static constexpr uint NmDeviceTypeWifi = 2;
 static constexpr uint NmApFlagPrivacy = 0x1;
@@ -31,7 +34,7 @@ static void wifiLog(const QString& message)
     QString timestamp = QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss.zzz");
     QString logLine = QString("[%1] %2\n").arg(timestamp, message);
 
-    QFile file(LOG_FILE);
+    QFile file(logFile());
     if (file.open(QIODevice::Append | QIODevice::Text))
     {
         QTextStream stream(&file);
@@ -47,7 +50,7 @@ NetworkManager::NetworkManager(QObject* parent)
 {
     qDBusRegisterMetaType<NMConnectionSettings>();
 
-    QFile file(LOG_FILE);
+    QFile file(logFile());
     if (file.open(QIODevice::WriteOnly | QIODevice::Text))
     {
         QTextStream stream(&file);
@@ -574,7 +577,7 @@ void NetworkManager::connectTo(const QString& ssid, const QString& password)
 void NetworkManager::startConnectionCheck()
 {
     m_connectionCheckCount++;
-    wifiLog(QString("Connection check attempt %1/10").arg(m_connectionCheckCount));
+    wifiLog(QString("Connection check attempt %1/30").arg(m_connectionCheckCount));
 
     updateConnectionState();
 
@@ -584,7 +587,7 @@ void NetworkManager::startConnectionCheck()
         return;
     }
 
-    if (m_connectionCheckCount < 10)
+    if (m_connectionCheckCount < 30)
     {
         QTimer::singleShot(1000, this, &NetworkManager::startConnectionCheck);
     }