diff options
| author | Ken Moore <ken@ixsystems.com> | 2017-11-22 10:49:20 -0500 |
|---|---|---|
| committer | Ken Moore <ken@ixsystems.com> | 2017-11-22 10:49:20 -0500 |
| commit | 23235740f9ea3ac85ea32fc183ac1f6707573578 (patch) | |
| tree | 91d9b4d5e2ed96978b089fede2e0e1ba6e276a7f /src-qt5/core | |
| parent | Quick adjustment for the finding of icons. (diff) | |
| download | lumina-23235740f9ea3ac85ea32fc183ac1f6707573578.tar.gz lumina-23235740f9ea3ac85ea32fc183ac1f6707573578.tar.bz2 lumina-23235740f9ea3ac85ea32fc183ac1f6707573578.zip | |
Fix the TrueOS update detection flag location.
Diffstat (limited to 'src-qt5/core')
| -rw-r--r-- | src-qt5/core/libLumina/LuminaOS-FreeBSD.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src-qt5/core/libLumina/LuminaOS-FreeBSD.cpp b/src-qt5/core/libLumina/LuminaOS-FreeBSD.cpp index 78fe5028..dc7de37f 100644 --- a/src-qt5/core/libLumina/LuminaOS-FreeBSD.cpp +++ b/src-qt5/core/libLumina/LuminaOS-FreeBSD.cpp @@ -248,7 +248,7 @@ bool LOS::systemPerformingUpdates(){ //Return the details of any updates which are waiting to apply on shutdown QString LOS::systemPendingUpdates(){ - if(QFile::exists("/tmp/.rebootRequired")){ return LUtils::readFile("/tmp/.rebootRequired").join("\n"); } + if(QFile::exists("/tmp/.trueos-update-staged")){ return LUtils::readFile("/tmp/.trueos-update-staged").join("\n"); } else{ return ""; } } @@ -260,7 +260,7 @@ void LOS::systemShutdown(bool skipupdates){ //start poweroff sequence //System Restart void LOS::systemRestart(bool skipupdates){ //start reboot sequence - bool activeupdates = !LUtils::readFile("/etc/defaults/vendor.conf").filter("trueos_active_update=\"YES\"").isEmpty(); + bool activeupdates = (LUtils::getCmdOutput("sysrc -n trueos_active_update").join("").simplified()=="YES"); if(skipupdates){ QProcess::startDetached("shutdown -ro now"); }else{ |