p2.8.5.2 VNC notice, pinn update, ae-ts

update ae-ts Prevent seg fault for manual update of PINN if no network Print notice when vncinstall is enabled
procount · Aug 8, 2018 · c43c0a9 · c43c0a9
1 parent e928168
commit c43c0a9
Show file tree

Hide file tree

Showing 25 changed files with 2,076 additions and 2,116 deletions.
diff --git a/README.md b/README.md
diff --git a/buildroot/package/recovery/init b/buildroot/package/recovery/init
@@ -160,6 +160,14 @@ fi
         fi
     done
 
+    if grep -q vncinstall /proc/cmdline; then
+        echo
+        echo "************************************************************************************"
+        echo "*** VNC is enabled on port 5900. Please connect using VNC to see the PINN screen ***"
+        echo "************************************************************************************"
+        echo
+    fi
+
     /usr/bin/recovery $RUN_INSTALLER $GPIO_TRIGGER $KEYBOARD_NO_TRIGGER $FORCE_TRIGGER $DEFAULT_KBD $DEFAULT_LANG $DEFAULT_DISPLAY $DEFAULT_PARTITION $DEFAULT_NOCONFIG $DEFAULT_DSI $DEFAULT_REPOS $EXTRA_REPOS $REPO_LIST $DEFAULT_STYLE -qws  2>/tmp/debug
 
 

diff --git a/recovery/config.h b/recovery/config.h
@@ -2,7 +2,7 @@
 #define CONFIG_H
 
 /* Version number displayed in the title bar */
-#define VERSION_NUMBER "2.8.5.1"
+#define VERSION_NUMBER "2.8.5.2"
 
 /* Color of the background */
 // #define BACKGROUND_COLOR  Qt::white

diff --git a/recovery/mainwindow.cpp b/recovery/mainwindow.cpp
@@ -507,7 +507,7 @@ void MainWindow::untarFirmware()
     {
         QProcess::execute("mount -o remount,rw /mnt");
 
-        QProcess::execute("bsdtar -xzf /mnt/firmware.tar.gz -C /mnt");
+        QProcess::execute("bsdtar --no-same-permissions --no-same-owner --no-xattrs -xzf /mnt/firmware.tar.gz -C /mnt");
         QProcess::execute("rm /mnt/firmware.tar.gz");
         sync();
         QProcess::execute("mount -o remount,ro /mnt");
@@ -1065,7 +1065,8 @@ void MainWindow::on_actionReinstall_triggered()
         {
             //Only check upgrades to PINN if it is the ONLY Os to be reinstalled
             //Because it causes a reboot
-            checkForUpdates( true );
+            if (requireNetwork())
+                checkForUpdates( true );
             return;
         }
         //Otherwise ignore PINN if there are more selected

diff --git a/recovery/translation_ae.ts b/recovery/translation_ae.ts
diff --git a/recovery/translation_ast.ts b/recovery/translation_ast.ts
diff --git a/recovery/translation_ca.ts b/recovery/translation_ca.ts
diff --git a/recovery/translation_de.ts b/recovery/translation_de.ts
diff --git a/recovery/translation_en.ts b/recovery/translation_en.ts
diff --git a/recovery/translation_es.ts b/recovery/translation_es.ts
diff --git a/recovery/translation_eu.ts b/recovery/translation_eu.ts
diff --git a/recovery/translation_fi.ts b/recovery/translation_fi.ts
diff --git a/recovery/translation_fr.ts b/recovery/translation_fr.ts
diff --git a/recovery/translation_hu.ts b/recovery/translation_hu.ts
diff --git a/recovery/translation_it.ts b/recovery/translation_it.ts
diff --git a/recovery/translation_ja.ts b/recovery/translation_ja.ts
diff --git a/recovery/translation_ko.ts b/recovery/translation_ko.ts
diff --git a/recovery/translation_nl.ts b/recovery/translation_nl.ts
diff --git a/recovery/translation_no.ts b/recovery/translation_no.ts
diff --git a/recovery/translation_pl.ts b/recovery/translation_pl.ts
diff --git a/recovery/translation_pt.ts b/recovery/translation_pt.ts
diff --git a/recovery/translation_ru.ts b/recovery/translation_ru.ts
diff --git a/recovery/translation_sv.ts b/recovery/translation_sv.ts
diff --git a/recovery/translation_tr.ts b/recovery/translation_tr.ts
diff --git a/recovery/translation_zh_TW.ts b/recovery/translation_zh_TW.ts