p2.8.5.5 - rebootp & bootmenutimeout for boot sticky

procount · Oct 1, 2018 · 9f68bf8 · 9f68bf8
1 parent bb98e24
commit 9f68bf8
Show file tree

Hide file tree

Showing 28 changed files with 512 additions and 507 deletions.
diff --git a/BUILDME.sh b/BUILDME.sh
@@ -104,6 +104,7 @@ IMAGES_DIR="output/images"
 
 SKIP_KERNEL_REBUILD=0
 SKIP_RECOVERY_REBUILD=0
+UPDATE_TS=0
 
 for i in $*; do
     # Update raspberrypi/firmware master HEAD version in package/rpi-firmware/rpi-firmware.mk to latest
@@ -121,6 +122,11 @@ for i in $*; do
         update_github_kernel_version raspberrypi/linux rpi-4.14.y
     fi
 
+    # Update language TS files
+    if [ $i = "update-ts" ]; then
+        UPDATE_TS=1
+    fi
+
     # Option to build just recovery without completely rebuilding both kernels
     if [ $i = "skip-kernel-rebuild" ]; then
         SKIP_KERNEL_REBUILD=1
@@ -148,7 +154,9 @@ fi
 make
 
 # copy any updated translation files
-cp $BUILD_DIR/recovery-$(get_package_version recovery)/*.ts ../recovery
+if [ $UPDATE_TS -eq 1 ]; then
+    cp $BUILD_DIR/recovery-$(get_package_version recovery)/*.ts ../recovery
+fi
 
 # Create output dir and copy files
 FINAL_OUTPUT_DIR="../$NOOBS_OUTPUT_DIR"

diff --git a/README.md b/README.md
diff --git a/README_PINN.md b/README_PINN.md
@@ -7,7 +7,7 @@ The latest version of [PINN](http://downloads.sourceforge.net/projects/pinn/pinn
 
 ### - [If you have PINN v2.4.3 - v2.4.4b installed, please manually update to v2.4.4c](https://www.raspberrypi.org/forums/viewtopic.php?f=63&t=142574&start=200#p1239359)
 
-This README relates to v2.8.5.4
+This README relates to v2.8.5.5
 
 <sup>(PINN-lite does not include any operating systems at all. It is more akin to `NOOBS-lite` rather than `NOOBS`. For that reason, the filename that you download is called `pinn-lite.zip`. More recently, `pinn.zip` has also been made available for download which includes versions of Raspbian and LibreELEC.)</sup>
 
@@ -418,7 +418,7 @@ In addition to specifying a list of OS names, some reserved words are also avail
 
 - **showall**: Shows all available installable OSes, whether they are suitable for the current model of Pi or not. Useful for preparing SD cards to be used in other RPis.
 
-- **bootmenutimeout=\<time in secs\>**: Changes the default timeout allowed before an OS is booted without any selection.
+- **bootmenutimeout=\<time in secs\>**: Changes the default timeout allowed before an OS is booted without any selection. (If this option is provided with a default sticky OS selected, the menu boot time will be respected, allowing you to choose another OS for this boot only).
 
 - **noobsconfig**: Prevents any noobsconfig customisations from being applied to an OS on installation
 
@@ -680,7 +680,8 @@ Also a Cancel button (Shortcut=Esc) is provided to boot back into PINN again.
 
 Each OS entry in the boot selection dialog has a checkbox next to it, allowing users to select it as a sticky default OS. If an OS is checked, PINN will operate as if that were the only OS installed (booting it automatically, without showing the boot selection dialog). This permits a slightly faster boot up time when one OS is used regularly. 
 
-To change or remove the sticky checkbox, or just to temporarily boot into another OS, the boot selection dialog can be shown again by pressing the Shift key on boot up and entering the recovery mode.
+To change or remove the sticky checkbox, or just to temporarily boot into another OS, the boot selection dialog can be shown again by pressing the Shift key on boot up and entering the recovery mode. Alternatively, if the cmdline **`bootmenutimeout`** option is specified, the bootmenu will be displayed for this timeout period before booting the selected OS, providing an alternative opportunity to change the OS to be booted.
+
 
 ### Reboot shell script
 
@@ -701,6 +702,10 @@ The <partition_number> is the partition number of the boot partition of the OS y
 
 NOTE: that once an `autoboot.txt` file is present, there's then no way to force the PINN GUI to display, until you delete (or rename) the `autoboot.txt` file. The SD card behaves as if PINN were not there at all.
 
+## Booting an OS directly from the recovery shell.
+
+The ususal `reboot` command does not work in the PINN recovery shell. However, a new command `rebootp` has been added to allow this. By providing a partition number as an argument, it is possible to boot directly into one of the installed OSes directly. E.G. `reboot 6` will boot direclty into the OS installed in partition 6. There is also `rebootp.sh` which may be better to use from an ssh shell, as it provides a cleaner exit to the ssh terminal.
+
 ---
 
 # Other Features

diff --git a/README_SUM.md b/README_SUM.md
@@ -45,6 +45,16 @@ Please note that in some cases it may extract the files into a folder, if this i
 
 ## Change History
 
+## V2.8.5.5
+
+- **Boot menu**               - Sticky default now uses bootmenutimeout
+- **rebootp**                 - Added rebootp command to recovery shell
+
+## V2.8.5.4
+
+- **Boot menu**               - Fixed focus and sticky default partuuid issues.
+- **wallpaper_resize**        - Customised wallpaper can now be resized to fill the screen
+
 ## V2.8.5.3
 
 - **Partuuid**                - Fixed an issue from v2.8 where partuuids were introduced to installed_os.json

diff --git a/changes.md b/changes.md
@@ -430,3 +430,8 @@ Fixes the incorrect recovery.cmdline bug in v2.5.2.
 
 - **Boot menu**               - Fixed focus and sticky default partuuid issues.
 - **wallpaper_resize**        - Customised wallpaper can now be resized to fill the screen
+
+## V2.8.5.5
+
+- **Boot menu**               - Sticky default now uses bootmenutimeout
+- **rebootp**                 - Added rebootp command to recovery shell
diff --git a/history.md b/history.md
@@ -5,6 +5,11 @@ PINN is a version of the NOOBS Operating System Installer for the Raspberry Pi w
 
 ## Change History
 
+## V2.8.5.5
+
+- **Boot menu**               - Sticky default now uses bootmenutimeout
+- **rebootp**                 - Added rebootp command to recovery shell
+
 ## V2.8.5.4
 
 - **Boot menu**               - Fixed focus and sticky default partuuid issues.

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.4b"
+#define VERSION_NUMBER "2.8.5.5"
 
 /* Color of the background */
 // #define BACKGROUND_COLOR  Qt::white

diff --git a/recovery/translation_ae.ts b/recovery/translation_ae.ts
@@ -4,38 +4,38 @@
 <context>
     <name>BootSelectionDialog</name>
     <message>
-        <location filename="bootselectiondialog.cpp" line="64"/>
+        <location filename="bootselectiondialog.cpp" line="69"/>
         <source>Cannot display boot menu</source>
         <translation>لا يمكن عرض قائمه الاقلاع</translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="64"/>
+        <location filename="bootselectiondialog.cpp" line="69"/>
         <source>Error mounting settings partition</source>
         <translation>خطا في تركيب قسم إعدادات</translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="301"/>
+        <location filename="bootselectiondialog.cpp" line="309"/>
         <source>HDMI safe mode</source>
         <translation>HDMI الوضع الأمن</translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="305"/>
+        <location filename="bootselectiondialog.cpp" line="313"/>
         <source>composite PAL mode</source>
         <translation>وضع PAL المركب</translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="309"/>
+        <location filename="bootselectiondialog.cpp" line="317"/>
         <source>composite NTSC mode</source>
         <translation>وضع NTSC  المركب</translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="351"/>
+        <location filename="bootselectiondialog.cpp" line="359"/>
         <source>PINN - Previously selected OS will boot in %1 seconds</source>
         <translation>PINN  - سيتم اختيار نظام التشغيل المحدد سابقا في %1 ثانية</translation>
     </message>
     <message>
         <location filename="bootselectiondialog.ui" line="25"/>
-        <location filename="bootselectiondialog.cpp" line="353"/>
+        <location filename="bootselectiondialog.cpp" line="361"/>
         <source>PINN - Select OS to boot</source>
         <translation>PINN - حدد نظام التشغيل للاقلاع</translation>
     </message>

diff --git a/recovery/translation_ast.ts b/recovery/translation_ast.ts
@@ -4,38 +4,38 @@
 <context>
     <name>BootSelectionDialog</name>
     <message>
-        <location filename="bootselectiondialog.cpp" line="64"/>
+        <location filename="bootselectiondialog.cpp" line="69"/>
         <source>Cannot display boot menu</source>
         <translation>Nun pue amosase&apos;l menú d&apos;arranque</translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="64"/>
+        <location filename="bootselectiondialog.cpp" line="69"/>
         <source>Error mounting settings partition</source>
         <translation>Fallu montando la partición d&apos;axustes</translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="301"/>
+        <location filename="bootselectiondialog.cpp" line="309"/>
         <source>HDMI safe mode</source>
         <translation>Mou seguru HDMI</translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="305"/>
+        <location filename="bootselectiondialog.cpp" line="313"/>
         <source>composite PAL mode</source>
         <translation>Mou compuestu PAL</translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="309"/>
+        <location filename="bootselectiondialog.cpp" line="317"/>
         <source>composite NTSC mode</source>
         <translation>mou compuestu NTSC</translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="351"/>
+        <location filename="bootselectiondialog.cpp" line="359"/>
         <source>PINN - Previously selected OS will boot in %1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="bootselectiondialog.ui" line="25"/>
-        <location filename="bootselectiondialog.cpp" line="353"/>
+        <location filename="bootselectiondialog.cpp" line="361"/>
         <source>PINN - Select OS to boot</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/recovery/translation_ca.ts b/recovery/translation_ca.ts
@@ -4,38 +4,38 @@
 <context>
     <name>BootSelectionDialog</name>
     <message>
-        <location filename="bootselectiondialog.cpp" line="64"/>
+        <location filename="bootselectiondialog.cpp" line="69"/>
         <source>Cannot display boot menu</source>
         <translation>No es pot visualitzar el menú d&apos;arrencada</translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="64"/>
+        <location filename="bootselectiondialog.cpp" line="69"/>
         <source>Error mounting settings partition</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="301"/>
+        <location filename="bootselectiondialog.cpp" line="309"/>
         <source>HDMI safe mode</source>
         <translation>mode HDMI segur</translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="305"/>
+        <location filename="bootselectiondialog.cpp" line="313"/>
         <source>composite PAL mode</source>
         <translation>mode PAL compost</translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="309"/>
+        <location filename="bootselectiondialog.cpp" line="317"/>
         <source>composite NTSC mode</source>
         <translation>mode NTSC compost</translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="351"/>
+        <location filename="bootselectiondialog.cpp" line="359"/>
         <source>PINN - Previously selected OS will boot in %1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="bootselectiondialog.ui" line="25"/>
-        <location filename="bootselectiondialog.cpp" line="353"/>
+        <location filename="bootselectiondialog.cpp" line="361"/>
         <source>PINN - Select OS to boot</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/recovery/translation_de.ts b/recovery/translation_de.ts
@@ -4,38 +4,38 @@
 <context>
     <name>BootSelectionDialog</name>
     <message>
-        <location filename="bootselectiondialog.cpp" line="64"/>
+        <location filename="bootselectiondialog.cpp" line="69"/>
         <source>Cannot display boot menu</source>
         <translation>Fehler beim Anzeigen des Bootmenüs</translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="64"/>
+        <location filename="bootselectiondialog.cpp" line="69"/>
         <source>Error mounting settings partition</source>
         <translation>Fehler beim Einbinden der Einstellungspartition</translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="301"/>
+        <location filename="bootselectiondialog.cpp" line="309"/>
         <source>HDMI safe mode</source>
         <translation>HDMI-Modus (sicher)</translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="305"/>
+        <location filename="bootselectiondialog.cpp" line="313"/>
         <source>composite PAL mode</source>
         <translation>Composite-PAL-Modus</translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="309"/>
+        <location filename="bootselectiondialog.cpp" line="317"/>
         <source>composite NTSC mode</source>
         <translation>Composite-NTSC-Modus</translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="351"/>
+        <location filename="bootselectiondialog.cpp" line="359"/>
         <source>PINN - Previously selected OS will boot in %1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="bootselectiondialog.ui" line="25"/>
-        <location filename="bootselectiondialog.cpp" line="353"/>
+        <location filename="bootselectiondialog.cpp" line="361"/>
         <source>PINN - Select OS to boot</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/recovery/translation_en.ts b/recovery/translation_en.ts
@@ -5,7 +5,7 @@
     <name>BootSelectionDialog</name>
     <message>
         <location filename="bootselectiondialog.ui" line="25"/>
-        <location filename="bootselectiondialog.cpp" line="353"/>
+        <location filename="bootselectiondialog.cpp" line="361"/>
         <source>PINN - Select OS to boot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20,32 +20,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="64"/>
+        <location filename="bootselectiondialog.cpp" line="69"/>
         <source>Cannot display boot menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="64"/>
+        <location filename="bootselectiondialog.cpp" line="69"/>
         <source>Error mounting settings partition</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="301"/>
+        <location filename="bootselectiondialog.cpp" line="309"/>
         <source>HDMI safe mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="305"/>
+        <location filename="bootselectiondialog.cpp" line="313"/>
         <source>composite PAL mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="309"/>
+        <location filename="bootselectiondialog.cpp" line="317"/>
         <source>composite NTSC mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="351"/>
+        <location filename="bootselectiondialog.cpp" line="359"/>
         <source>PINN - Previously selected OS will boot in %1 seconds</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/recovery/translation_es.ts b/recovery/translation_es.ts
@@ -4,39 +4,39 @@
 <context>
     <name>BootSelectionDialog</name>
     <message>
-        <location filename="bootselectiondialog.cpp" line="64"/>
+        <location filename="bootselectiondialog.cpp" line="69"/>
         <source>Cannot display boot menu</source>
         <translation>No se puede mostrar el menú de arranque</translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="64"/>
+        <location filename="bootselectiondialog.cpp" line="69"/>
         <source>Error mounting settings partition</source>
         <translatorcomment>La partición Settings es la partición con la configuración de PINN</translatorcomment>
         <translation>Error al montar la partición Settings</translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="301"/>
+        <location filename="bootselectiondialog.cpp" line="309"/>
         <source>HDMI safe mode</source>
         <translation>Modo HDMI seguro (safe)</translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="305"/>
+        <location filename="bootselectiondialog.cpp" line="313"/>
         <source>composite PAL mode</source>
         <translation>Modo PAL compuesto</translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="309"/>
+        <location filename="bootselectiondialog.cpp" line="317"/>
         <source>composite NTSC mode</source>
         <translation>Modo NTSC compuesto</translation>
     </message>
     <message>
-        <location filename="bootselectiondialog.cpp" line="351"/>
+        <location filename="bootselectiondialog.cpp" line="359"/>
         <source>PINN - Previously selected OS will boot in %1 seconds</source>
         <translation>PINN - El SO previamente seleccionado se iniciara en %1 segundos</translation>
     </message>
     <message>
         <location filename="bootselectiondialog.ui" line="25"/>
-        <location filename="bootselectiondialog.cpp" line="353"/>
+        <location filename="bootselectiondialog.cpp" line="361"/>
         <source>PINN - Select OS to boot</source>
         <translation>PINN - Seleccione el SO qué desea iniciar</translation>
     </message>