luci-app-advanced-reboot: properly handle multiple or missing lan IPs

Fixes: #3587
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua b/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua
index 8b68ecbedb60e012181adaf86664e974fc48eb5d..097c71d676f8939d7cdfc11a93f1fb4bae801c80 100644 (file)
--- a/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua
+++ b/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua
@@ -183,7 +183,7 @@ function action_reboot()
        ltemplate.render("advanced_reboot/applyreboot", {
                                title = i18n.translate("Rebooting..."),
                                msg   = i18n.translate("The system is rebooting now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."),
-                               addr  = ip.new(type(ip) == "string" and ip or "192.168.1.1") or "192.168.1.1"
+                               addr  = ip.new(util.imatch(ip)() or "192.168.1.1")
                        })
        sys.reboot()
 end
@@ -255,7 +255,7 @@ function action_altreboot()
                        ltemplate.render("advanced_reboot/applyreboot", {
                                                title = i18n.translate("Rebooting..."),
                                                msg   = i18n.translate("The system is rebooting to an alternative partition now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."),
-                                               addr  = ip.new(uci:get("network", "lan", "ipaddr")) or "192.168.1.1"
+                                               addr  = ip.new(util.imatch(uci:get("network", "lan", "ipaddr"))() or "192.168.1.1")
                                        })
                        sys.reboot()
                else
@@ -288,7 +288,7 @@ function action_poweroff()
                ltemplate.render("advanced_reboot/applyreboot", {
                                        title = i18n.translate("Shutting down..."),
                                        msg   = i18n.translate("The system is shutting down now.<br /> DO NOT POWER OFF THE DEVICE!<br /> It might be necessary to renew the address of your computer to reach the device again, depending on your settings."),
-                                       addr  = ip.new(uci:get("network", "lan", "ipaddr")) or "192.168.1.1"
+                                       addr  = ip.new(util.imatch(uci:get("network", "lan", "ipaddr"))() or "192.168.1.1")
                                })
                sys.call("/sbin/poweroff")
        end