summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-app-advanced-reboot
diff options
context:
space:
mode:
Diffstat (limited to 'applications/luci-app-advanced-reboot')
-rw-r--r--applications/luci-app-advanced-reboot/Makefile2
-rw-r--r--applications/luci-app-advanced-reboot/po/en/advanced-reboot.po8
-rw-r--r--applications/luci-app-advanced-reboot/po/lt/advanced-reboot.po14
-rw-r--r--applications/luci-app-advanced-reboot/po/pl/advanced-reboot.po24
-rw-r--r--applications/luci-app-advanced-reboot/po/tr/advanced-reboot.po9
-rw-r--r--applications/luci-app-advanced-reboot/po/uk/advanced-reboot.po28
-rwxr-xr-xapplications/luci-app-advanced-reboot/root/usr/libexec/rpcd/luci.advanced_reboot33
-rw-r--r--applications/luci-app-advanced-reboot/root/usr/share/advanced-reboot/devices/mercusys-mr90xv1.json16
8 files changed, 83 insertions, 51 deletions
diff --git a/applications/luci-app-advanced-reboot/Makefile b/applications/luci-app-advanced-reboot/Makefile
index 6c1dead622..11697f3b0d 100644
--- a/applications/luci-app-advanced-reboot/Makefile
+++ b/applications/luci-app-advanced-reboot/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
-PKG_VERSION:=1.0.1-8
+PKG_VERSION:=1.0.1-9
LUCI_TITLE:=Advanced Linksys Reboot Web UI
LUCI_URL:=https://docs.openwrt.melmac.net/luci-app-advanced-reboot/
diff --git a/applications/luci-app-advanced-reboot/po/en/advanced-reboot.po b/applications/luci-app-advanced-reboot/po/en/advanced-reboot.po
index cda5332405..f7ea220765 100644
--- a/applications/luci-app-advanced-reboot/po/en/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/en/advanced-reboot.po
@@ -1,14 +1,14 @@
msgid ""
msgstr ""
-"PO-Revision-Date: 2022-07-03 10:18+0000\n"
-"Last-Translator: Hannu Nyman <hannu.nyman@iki.fi>\n"
+"PO-Revision-Date: 2023-11-30 14:34+0000\n"
+"Last-Translator: rygle <pittos@post.com>\n"
"Language-Team: English <https://hosted.weblate.org/projects/openwrt/"
"luciapplicationsadvanced-reboot/en/>\n"
"Language: en\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.13.1-dev\n"
+"X-Generator: Weblate 5.3-dev\n"
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:193
#: applications/luci-app-advanced-reboot/root/usr/share/luci/menu.d/luci-app-advanced-reboot.json:3
@@ -18,7 +18,7 @@ msgstr ""
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:58
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:141
msgid "Cancel"
-msgstr ""
+msgstr "Cancel"
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:168
msgid "Compressed"
diff --git a/applications/luci-app-advanced-reboot/po/lt/advanced-reboot.po b/applications/luci-app-advanced-reboot/po/lt/advanced-reboot.po
index b4aa4a9f72..75e7cb1db5 100644
--- a/applications/luci-app-advanced-reboot/po/lt/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/lt/advanced-reboot.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2023-08-28 01:55+0000\n"
+"PO-Revision-Date: 2023-12-02 18:04+0000\n"
"Last-Translator: Džiugas J <dziugas1959@hotmail.com>\n"
"Language-Team: Lithuanian <https://hosted.weblate.org/projects/openwrt/"
"luciapplicationsadvanced-reboot/lt/>\n"
@@ -12,7 +12,7 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n % 10 == 1 && (n % 100 < 11 || n % 100 > "
"19)) ? 0 : ((n % 10 >= 2 && n % 10 <= 9 && (n % 100 < 11 || n % 100 > 19)) ? "
"1 : 2);\n"
-"X-Generator: Weblate 5.0.1-dev\n"
+"X-Generator: Weblate 5.3-dev\n"
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:193
#: applications/luci-app-advanced-reboot/root/usr/share/luci/menu.d/luci-app-advanced-reboot.json:3
@@ -47,7 +47,7 @@ msgstr "Programinė įranga – „Firmware“"
#: applications/luci-app-advanced-reboot/root/usr/share/rpcd/acl.d/luci-app-advanced-reboot.json:3
msgid "Grant UCI and file access for luci-app-advanced-reboot"
-msgstr "Suteikti „UCI“ ir failų prieigą „luci-app-advanced-reboot“"
+msgstr "Suteikti „UCI“ ir failų prieigą – „luci-app-advanced-reboot“"
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:127
msgid "No access to fw_printenv or fw_printenv!"
@@ -103,7 +103,7 @@ msgstr "Išjungiama..."
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:210
msgid "Status"
-msgstr "Būsena"
+msgstr "Būklė/Būsena"
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:17
msgid "The Dual Boot Flag Partition: %s is not a block device."
@@ -158,7 +158,7 @@ msgstr ""
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:168
msgid "Unknown"
-msgstr ""
+msgstr "Nežinomas"
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:131
msgid ""
@@ -181,7 +181,7 @@ msgstr ""
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:76
msgid "Waiting for device..."
-msgstr ""
+msgstr "Laukiama įrenginio..."
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:221
msgid ""
@@ -192,7 +192,7 @@ msgstr ""
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:198
msgid "Warning: There are unsaved changes that will get lost on reboot!"
-msgstr ""
+msgstr "Ispėjimas: Yra neišsaugotų pakeitimų, kurie bus prarasti perkraunant!"
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:238
msgid "Warning: This system does not support powering off!"
diff --git a/applications/luci-app-advanced-reboot/po/pl/advanced-reboot.po b/applications/luci-app-advanced-reboot/po/pl/advanced-reboot.po
index a4ec35a42a..9975d50dc9 100644
--- a/applications/luci-app-advanced-reboot/po/pl/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/pl/advanced-reboot.po
@@ -1,6 +1,6 @@
msgid ""
msgstr ""
-"PO-Revision-Date: 2023-07-16 20:28+0000\n"
+"PO-Revision-Date: 2023-11-07 22:37+0000\n"
"Last-Translator: Matthaiks <kitynska@gmail.com>\n"
"Language-Team: Polish <https://hosted.weblate.org/projects/openwrt/"
"luciapplicationsadvanced-reboot/pl/>\n"
@@ -9,12 +9,12 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 5.0-dev\n"
+"X-Generator: Weblate 5.2-dev\n"
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:193
#: applications/luci-app-advanced-reboot/root/usr/share/luci/menu.d/luci-app-advanced-reboot.json:3
msgid "Advanced Reboot"
-msgstr "Zaawansowany restart"
+msgstr "Zaawansowany restart urządzenia"
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:58
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:141
@@ -44,7 +44,7 @@ msgstr "Firmware"
#: applications/luci-app-advanced-reboot/root/usr/share/rpcd/acl.d/luci-app-advanced-reboot.json:3
msgid "Grant UCI and file access for luci-app-advanced-reboot"
-msgstr "Udziel dostępu UCI i plikom do luci-app-advanced-reboot"
+msgstr "Przyznaj luci-app-advanced-reboot dostęp do UCI i plików"
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:127
msgid "No access to fw_printenv or fw_printenv!"
@@ -174,12 +174,12 @@ msgstr ""
"OSTRZEŻENIE: Inna partycja może mieć swoje własne ustawienia i zupełnie inny "
"firmware.<br /><br /> Ponieważ konfiguracja sieci i SSID/hasło WiFi na innej "
"partycji mogą być różne, być może trzeba będzie dostosować ustawienia "
-"komputera, aby mieć dostęp do urządzenia po ponownym uruchomieniu systemu."
-"<br /><br /> Należy również pamiętać, że alternatywne firmware partycji może "
-"nie zapewniać łatwego sposobu przełączenia aktywnej partycji i ponownego "
-"uruchomienia systemu na obecnie aktywną partycję.<br /><br /> Kliknij "
-"przycisk \"Kontynuuj\" poniżej, aby zrestartować urządzenie do innej "
-"partycji."
+"komputera, aby mieć dostęp do urządzenia po ponownym uruchomieniu "
+"systemu.<br /><br /> Należy również pamiętać, że alternatywne firmware "
+"partycji może nie zapewniać łatwego sposobu przełączenia aktywnej partycji i "
+"ponownego uruchomienia systemu na obecnie aktywną partycję.<br /><br /> "
+"Kliknij przycisk \"Przejdź dalej\" poniżej, aby zrestartować urządzenie do "
+"innej partycji."
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:52
msgid ""
@@ -188,8 +188,8 @@ msgid ""
"device."
msgstr ""
"OSTRZEŻENIE: Wyłączenie może skutkować ponownym uruchomieniem urządzenia, "
-"które nie obsługuje wyłączenia zasilania.<br /><br /> Kliknij \"Kontynuuj\" "
-"poniżej, aby wyłączyć urządzenie."
+"które nie obsługuje wyłączenia zasilania.<br /><br /> Kliknij \"Przejdź "
+"dalej\" poniżej, aby wyłączyć urządzenie."
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:76
msgid "Waiting for device..."
diff --git a/applications/luci-app-advanced-reboot/po/tr/advanced-reboot.po b/applications/luci-app-advanced-reboot/po/tr/advanced-reboot.po
index 053ec94610..5058f2ad1f 100644
--- a/applications/luci-app-advanced-reboot/po/tr/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/tr/advanced-reboot.po
@@ -1,6 +1,6 @@
msgid ""
msgstr ""
-"PO-Revision-Date: 2021-05-11 11:34+0000\n"
+"PO-Revision-Date: 2023-10-29 19:41+0000\n"
"Last-Translator: semih <semiht@gmail.com>\n"
"Language-Team: Turkish <https://hosted.weblate.org/projects/openwrt/"
"luciapplicationsadvanced-reboot/tr/>\n"
@@ -8,7 +8,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.7-dev\n"
+"X-Generator: Weblate 5.2-dev\n"
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:193
#: applications/luci-app-advanced-reboot/root/usr/share/luci/menu.d/luci-app-advanced-reboot.json:3
@@ -154,7 +154,7 @@ msgstr "Yazılım ortam değişkeni ayarlanamıyor: %s'ten %s'e."
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:168
msgid "Unknown"
-msgstr "Bilinmiyor"
+msgstr "Bilinmeyen"
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:131
msgid ""
@@ -196,6 +196,9 @@ msgid ""
"seeing this on an OpenWrt dual-firmware supported device,%splease refer to "
"%sHow to add a new device section of the README%s."
msgstr ""
+"Uyarı: Cihaz (%s) bilinmiyor veya çift bellenimli bir cihaz değil!%sBunu "
+"OpenWrt çift bellenim destekli bir cihazda görüyorsanız,%slütfen "
+"README%s'nin %sYeni cihaz nasıl eklenir bölümüne bakın%s."
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:198
msgid "Warning: There are unsaved changes that will get lost on reboot!"
diff --git a/applications/luci-app-advanced-reboot/po/uk/advanced-reboot.po b/applications/luci-app-advanced-reboot/po/uk/advanced-reboot.po
index d4af316e36..4f19947df4 100644
--- a/applications/luci-app-advanced-reboot/po/uk/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/uk/advanced-reboot.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
-"PO-Revision-Date: 2023-03-30 16:55+0000\n"
-"Last-Translator: CakesTwix <cakestwix1@gmail.com>\n"
+"PO-Revision-Date: 2023-10-19 04:13+0000\n"
+"Last-Translator: Oleksandr Shvets <oleksandr.shvets@icloud.com>\n"
"Language-Team: Ukrainian <https://hosted.weblate.org/projects/openwrt/"
"luciapplicationsadvanced-reboot/uk/>\n"
"Language: uk\n"
@@ -9,7 +9,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.17-dev\n"
+"X-Generator: Weblate 5.1\n"
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:193
#: applications/luci-app-advanced-reboot/root/usr/share/luci/menu.d/luci-app-advanced-reboot.json:3
@@ -60,7 +60,7 @@ msgstr "Розділи"
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:235
msgid "Perform power off..."
-msgstr "Вимкнути..."
+msgstr "Вимкнути живлення..."
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:51
msgid "Power Off Device"
@@ -77,15 +77,15 @@ msgstr "Перезавантаження"
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:130
msgid "Reboot Device to an Alternative Partition"
-msgstr "Перезавантажити пристрій в інший розділ"
+msgstr "Перезавантажити пристрій з іншого розділу"
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:162
msgid "Reboot to alternative partition..."
-msgstr "Перезавантажити в інший розділ..."
+msgstr "Перезавантажити з іншого розділу..."
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:159
msgid "Reboot to current partition"
-msgstr "Перезавантажити в поточний розділ"
+msgstr "Перезавантажити з поточного роздіу"
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:75
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:80
@@ -147,7 +147,7 @@ msgstr "Не вдається отримати змінну середовища
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:18
msgid "Unable to set Dual Boot Flag Partition entry for partition: %s."
-msgstr ""
+msgstr "Для цього розділу не можна вмикнути флаг подвійного завантаження: %s."
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:20
msgid "Unable to set firmware environment variable: %s to %s."
@@ -184,10 +184,13 @@ msgid ""
"support power off.<br /><br /> Click \"Proceed\" below to power off your "
"device."
msgstr ""
+"ПОПЕРЕДЖЕННЯ: вимкнення живлення може довести до постійного "
+"перезавантаження пристрою, якщо він не підтримує вимкнутий стан. <br /><br /"
+">Ви дійсно бажаєте вимкнути цей пристрій?"
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:76
msgid "Waiting for device..."
-msgstr ""
+msgstr "Очикую пристрій..,"
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:221
msgid ""
@@ -195,6 +198,9 @@ msgid ""
"seeing this on an OpenWrt dual-firmware supported device,%splease refer to "
"%sHow to add a new device section of the README%s."
msgstr ""
+"Попередження! Пристрій (%s) не впізнано, або він не підтримує подвійної "
+"загрузки! %s якщо ви бачите це на OpenWrt dual-firmware пристрою, будь ласка "
+"зверніться до розділу «Як додати новий пристрій» README."
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:198
msgid "Warning: There are unsaved changes that will get lost on reboot!"
@@ -203,11 +209,11 @@ msgstr ""
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:238
msgid "Warning: This system does not support powering off!"
-msgstr ""
+msgstr "Обережно! Ця система не підтримує вимкнення живлення!"
#: applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js:225
msgid "Warning: Unable to obtain device information!"
-msgstr ""
+msgstr "Попередження: Немає можливості зчитати дані пристрою!"
#~ msgid "Alternative"
#~ msgstr "Альтернатива"
diff --git a/applications/luci-app-advanced-reboot/root/usr/libexec/rpcd/luci.advanced_reboot b/applications/luci-app-advanced-reboot/root/usr/libexec/rpcd/luci.advanced_reboot
index b92459a7b3..c79ed77474 100755
--- a/applications/luci-app-advanced-reboot/root/usr/libexec/rpcd/luci.advanced_reboot
+++ b/applications/luci-app-advanced-reboot/root/usr/libexec/rpcd/luci.advanced_reboot
@@ -23,7 +23,7 @@ is_alt_mountable() {
}
alt_partition_mount() {
- local ubi_dev op_ubi="$1"
+ local ubi_dev op_ubi="$1" ubi_vol="${2:-0}"
mkdir -p /var/alt_rom
ubi_dev="$(ubiattach -m "$op_ubi")"
ubi_dev="$(echo "$ubi_dev" | sed -n "s/^UBI device number\s*\(\d*\),.*$/\1/p")"
@@ -31,12 +31,12 @@ alt_partition_mount() {
ubidetach -m "$op_ubi"
return 1
fi
- ubiblock --create "/dev/ubi${ubi_dev}_0" && \
- mount -t squashfs -r "/dev/ubiblock${ubi_dev}_0" /var/alt_rom
+ ubiblock --create "/dev/ubi${ubi_dev}_${ubi_vol}" && \
+ mount -t squashfs -r "/dev/ubiblock${ubi_dev}_${ubi_vol}" /var/alt_rom
}
alt_partition_unmount() {
- local mtdCount i=0 op_ubi="$1"
+ local mtdCount i=0 op_ubi="$1" ubi_vol="${2:-0}"
mtdCount="$(ubinfo | grep 'Present UBI devices' | tr ',' '\n' | grep -c 'ubi')"
[ -z "$mtdCount" ] && mtdCount=10
[ -d /var/alt_rom ] && umount /var/alt_rom
@@ -46,7 +46,7 @@ alt_partition_unmount() {
fi
ubi_mtd="$(cat /sys/devices/virtual/ubi/ubi${i}/mtd_num)"
if [ -n "$ubi_mtd" ] && [ "$ubi_mtd" = "$op_ubi" ]; then
- ubiblock --remove /dev/ubi${i}_0
+ ubiblock --remove /dev/ubi${i}_${ubi_vol}
ubidetach -m "$op_ubi"
rm -rf /var/alt_rom
fi
@@ -66,18 +66,21 @@ get_main_partition_os_info(){
}
get_alt_partition_os_info(){
- local op_info op_ubi="$1"
+ local op_info op_ubi="$1" vendor_name="$2" ubi_vol="$3"
logger "attempting to mount alternative partition (mtd${op_ubi})"
- alt_partition_unmount "$op_ubi"
- alt_partition_mount "$op_ubi"
+ alt_partition_unmount "$op_ubi" "$ubi_vol"
+ alt_partition_mount "$op_ubi" "$ubi_vol"
if [ -s "/var/alt_rom/etc/os-release" ]; then
op_info="$(. /var/alt_rom/etc/os-release && echo "$PRETTY_NAME")"
if [ "${op_info//SNAPSHOT}" != "$op_info" ]; then
op_info="$(. /var/alt_rom/etc/os-release && echo "${OPENWRT_RELEASE%%-*}")"
fi
fi
+ if [ -s "/var/alt_rom/etc/partition_config/soft-version" ]; then
+ op_info="${vendor_name:+$vendor_name }$(awk -F: '$1=="soft_ver" { print $2 ;}' /var/alt_rom/etc/partition_config/soft-version)"
+ fi
logger "attempting to unmount alternative partition (mtd${op_ubi})"
- alt_partition_unmount "$op_ubi"
+ alt_partition_unmount "$op_ubi" "$ubi_vol"
echo "$op_info"
}
@@ -102,6 +105,7 @@ print_json() { json_init; json_add_string "$1" "$2"; json_dump; json_cleanup; }
obtain_device_info(){
local romBoardName p zyxelFlagPartition i
local vendorName deviceName partition1MTD partition2MTD labelOffset
+ local opOffset ubiVolume
local bootEnv1 bootEnv1Partition1Value bootEnv1Partition2Value
local bootEnv2 bootEnv2Partition1Value bootEnv2Partition2Value
local p1_label p1_version p2_label p2_version p1_os p2_os
@@ -122,7 +126,8 @@ obtain_device_info(){
json_load_file "$p"
for i in vendorName deviceName partition1MTD partition2MTD labelOffset \
bootEnv1 bootEnv1Partition1Value bootEnv1Partition2Value \
- bootEnv2 bootEnv2Partition1Value bootEnv2Partition2Value; do
+ bootEnv2 bootEnv2Partition1Value bootEnv2Partition2Value \
+ opOffset ubiVolume; do
json_get_var $i "$i"
done
json_cleanup
@@ -185,13 +190,15 @@ obtain_device_info(){
fi
if is_alt_mountable "$partition1MTD" "$partition2MTD"; then
+ opOffset="${opOffset:-1}"
+ ubiVolume="${ubiVolume:-0}"
if [ "$current_partition" = "$bootEnv1Partition1Value" ]; then
- op_ubi=$(( ${partition2MTD:3:3} + 1 ))
+ op_ubi=$(( ${partition2MTD:3:3} + $opOffset ))
else
- op_ubi=$(( ${partition1MTD:3:3} + 1 ))
+ op_ubi=$(( ${partition1MTD:3:3} + $opOffset ))
fi
cp_info="$(get_main_partition_os_info $op_ubi)"
- op_info="$(get_alt_partition_os_info $op_ubi)"
+ op_info="$(get_alt_partition_os_info $op_ubi $vendorName $ubiVolume)"
if [ "$current_partition" = "$bootEnv1Partition1Value" ]; then
p1_os="${cp_info:-$p1_os}"
p2_os="${op_info:-$p2_os}"
diff --git a/applications/luci-app-advanced-reboot/root/usr/share/advanced-reboot/devices/mercusys-mr90xv1.json b/applications/luci-app-advanced-reboot/root/usr/share/advanced-reboot/devices/mercusys-mr90xv1.json
new file mode 100644
index 0000000000..02be54345a
--- /dev/null
+++ b/applications/luci-app-advanced-reboot/root/usr/share/advanced-reboot/devices/mercusys-mr90xv1.json
@@ -0,0 +1,16 @@
+{
+ "vendorName": "MERCUSYS",
+ "deviceName": "MR90X v1",
+ "boardNames": [ "mercusys,mr90x-v1" ],
+ "partition1MTD": "mtd2",
+ "partition2MTD": "mtd3",
+ "opOffset": 0,
+ "ubiVolume": 2,
+ "labelOffset": null,
+ "bootEnv1": "tp_boot_idx",
+ "bootEnv1Partition1Value": 0,
+ "bootEnv1Partition2Value": 1,
+ "bootEnv2": null,
+ "bootEnv2Partition1Value": null,
+ "bootEnv2Partition2Value": null
+}