luci-compat: opkg_package -> package_name

opkg is no longer available as the generic name for package-manager

Signed-off-by: Paul Donald <newtwen+github@gmail.com>

diff --git a/modules/luci-compat/luasrc/model/network.lua b/modules/luci-compat/luasrc/model/network.lua
index 1c25f899da43f14030687280d771d71a146b875d..e891b4fab5fe4d5a2954ceb57260d1cdeafedb44 100644 (file)
--- a/modules/luci-compat/luasrc/model/network.lua
+++ b/modules/luci-compat/luasrc/model/network.lua
@@ -1146,7 +1146,7 @@ function protocol.is_bridge(self)
        return (not self:is_virtual() and self:type() == "bridge")
 end
 
-function protocol.opkg_package(self)
+function protocol.package_name(self)
        return nil
 end
 

diff --git a/modules/luci-compat/luasrc/model/network/proto_3g.lua b/modules/luci-compat/luasrc/model/network/proto_3g.lua
index 60d8e2ebae20b38ce38931e29885c339d2bf99b4..9c06a30a5e4f1865903c9821a942891a25b72179 100644 (file)
--- a/modules/luci-compat/luasrc/model/network/proto_3g.lua
+++ b/modules/luci-compat/luasrc/model/network/proto_3g.lua
@@ -22,7 +22,7 @@ function proto.is_installed(self)
        return nixio.fs.access("/lib/netifd/proto/3g.sh")
 end
 
-function proto.opkg_package(self)
+function proto.package_name(self)
        return "comgt"
 end
 

diff --git a/modules/luci-compat/luasrc/model/network/proto_4x6.lua b/modules/luci-compat/luasrc/model/network/proto_4x6.lua
index 4ab9a630c1111ac22b0b6db0513ba73812df9f24..cd5db7b3213c0e8427f9a124e5369044aaa04f4c 100644 (file)
--- a/modules/luci-compat/luasrc/model/network/proto_4x6.lua
+++ b/modules/luci-compat/luasrc/model/network/proto_4x6.lua
@@ -25,7 +25,7 @@ for _, p in ipairs({"dslite", "map", "464xlat"}) do
                return p .. "-" .. self.sid
        end
 
-       function proto.opkg_package(self)
+       function proto.package_name(self)
                if p == "dslite" or p == "ipip6" then
                        return "ds-lite"
                elseif p == "map" then

diff --git a/modules/luci-compat/luasrc/model/network/proto_6x4.lua b/modules/luci-compat/luasrc/model/network/proto_6x4.lua
index 2fd0b119578a7466f24da38a0a3c6141a2aca040..4e709e7f151b2b41d6e47614514aac0edd2d1554 100644 (file)
--- a/modules/luci-compat/luasrc/model/network/proto_6x4.lua
+++ b/modules/luci-compat/luasrc/model/network/proto_6x4.lua
@@ -22,7 +22,7 @@ for _, p in ipairs({"6in4", "6to4", "6rd"}) do
                return p .. "-" .. self.sid
        end
 
-       function proto.opkg_package(self)
+       function proto.package_name(self)
                return p
        end
 

diff --git a/modules/luci-compat/luasrc/model/network/proto_dhcpv6.lua b/modules/luci-compat/luasrc/model/network/proto_dhcpv6.lua
index 0b45dad05054630fde5b32d220ea5bf7e4171ddc..a0c0119c22a0e67315137e60b95b00a996dfa12a 100644 (file)
--- a/modules/luci-compat/luasrc/model/network/proto_dhcpv6.lua
+++ b/modules/luci-compat/luasrc/model/network/proto_dhcpv6.lua
@@ -11,6 +11,6 @@ function proto.is_installed(self)
        return nixio.fs.access("/lib/netifd/proto/dhcpv6.sh")
 end
 
-function proto.opkg_package(self)
+function proto.package_name(self)
        return "odhcp6c"
 end

diff --git a/modules/luci-compat/luasrc/model/network/proto_hnet.lua b/modules/luci-compat/luasrc/model/network/proto_hnet.lua
index f525061be48da623fc416ab1088cde8f7a156a9d..02801156f860c122494a189106981eb6cc84413b 100644 (file)
--- a/modules/luci-compat/luasrc/model/network/proto_hnet.lua
+++ b/modules/luci-compat/luasrc/model/network/proto_hnet.lua
@@ -11,6 +11,6 @@ function proto.is_installed(self)
        return nixio.fs.access("/lib/netifd/proto/hnet.sh")
 end
 
-function proto.opkg_package(self)
+function proto.package_name(self)
        return "hnet-full"
 end

diff --git a/modules/luci-compat/luasrc/model/network/proto_ipip.lua b/modules/luci-compat/luasrc/model/network/proto_ipip.lua
index 04d2e78b09f3ae700b1841ee386615665da3e388..1d6a37ffec1d1cee0347a3538b82437b52c58527 100644 (file)
--- a/modules/luci-compat/luasrc/model/network/proto_ipip.lua
+++ b/modules/luci-compat/luasrc/model/network/proto_ipip.lua
@@ -13,7 +13,7 @@ function proto.ifname(self)
        return "ipip-" .. self.sid
 end
 
-function proto.opkg_package(self)
+function proto.package_name(self)
        return "ipip"
 end
 

diff --git a/modules/luci-compat/luasrc/model/network/proto_modemmanager.lua b/modules/luci-compat/luasrc/model/network/proto_modemmanager.lua
index 3ad15dfd22166549613b82295fb7769123aa5f8b..0c83f6e0314ed9bdf9cc83f246028427b491202e 100644 (file)
--- a/modules/luci-compat/luasrc/model/network/proto_modemmanager.lua
+++ b/modules/luci-compat/luasrc/model/network/proto_modemmanager.lua
@@ -24,7 +24,7 @@ function proto.get_interface(self)
        return interface(self:ifname(), self)
 end
 
-function proto.opkg_package(self)
+function proto.package_name(self)
        return "modemmanager"
 end
 

diff --git a/modules/luci-compat/luasrc/model/network/proto_ncm.lua b/modules/luci-compat/luasrc/model/network/proto_ncm.lua
index 49abe234728d4d58c5f99d9a0bdf865d80efb49d..16c58fc6234fa52cf095124d237421d9ae5eb2e6 100644 (file)
--- a/modules/luci-compat/luasrc/model/network/proto_ncm.lua
+++ b/modules/luci-compat/luasrc/model/network/proto_ncm.lua
@@ -26,7 +26,7 @@ function proto.get_i18n(self)
        return luci.i18n.translate("NCM")
 end
 
-function proto.opkg_package(self)
+function proto.package_name(self)
        return "comgt-ncm"
 end
 

diff --git a/modules/luci-compat/luasrc/model/network/proto_openconnect.lua b/modules/luci-compat/luasrc/model/network/proto_openconnect.lua
index 0944c7fe6ae633ee90c6a455be649fdec399e075..596e7c8b0c9e933415e256eb6b9970793e5b8f3e 100644 (file)
--- a/modules/luci-compat/luasrc/model/network/proto_openconnect.lua
+++ b/modules/luci-compat/luasrc/model/network/proto_openconnect.lua
@@ -17,7 +17,7 @@ function proto.get_interface(self)
        return interface(self:ifname(), self)
 end
 
-function proto.opkg_package(self)
+function proto.package_name(self)
        return "openconnect"
 end
 

diff --git a/modules/luci-compat/luasrc/model/network/proto_ppp.lua b/modules/luci-compat/luasrc/model/network/proto_ppp.lua
index f87b30fcc176237fb5670ae08edbe4c1ce3692bc..e96b96ca231bf0c34ce907201028728412e08c05 100644 (file)
--- a/modules/luci-compat/luasrc/model/network/proto_ppp.lua
+++ b/modules/luci-compat/luasrc/model/network/proto_ppp.lua
@@ -26,7 +26,7 @@ for _, p in ipairs({"ppp", "pptp", "pppoe", "pppoa", "l2tp"}) do
                return p .. "-" .. self.sid
        end
 
-       function proto.opkg_package(self)
+       function proto.package_name(self)
                if p == "ppp" then
                        return p
                elseif p == "pptp" then

diff --git a/modules/luci-compat/luasrc/model/network/proto_pppossh.lua b/modules/luci-compat/luasrc/model/network/proto_pppossh.lua
index a0e2a510c9beb4e045528ec6fbe5817fae8ba9a7..730132cd77442597fc948ad55fd8bfa368210a0e 100644 (file)
--- a/modules/luci-compat/luasrc/model/network/proto_pppossh.lua
+++ b/modules/luci-compat/luasrc/model/network/proto_pppossh.lua
@@ -13,7 +13,7 @@ function proto.ifname(self)
        return "pppossh-" .. self.sid
 end
 
-function proto.opkg_package(self)
+function proto.package_name(self)
        return "pppossh"
 end
 

diff --git a/modules/luci-compat/luasrc/model/network/proto_qmi.lua b/modules/luci-compat/luasrc/model/network/proto_qmi.lua
index c414378d8097f38d1f85b246414e87e86f17b080..1c3176d331baa10939c1546521708d0a76b59bba 100644 (file)
--- a/modules/luci-compat/luasrc/model/network/proto_qmi.lua
+++ b/modules/luci-compat/luasrc/model/network/proto_qmi.lua
@@ -24,7 +24,7 @@ function proto.get_interface(self)
        return interface(self:ifname(), self)
 end
 
-function proto.opkg_package(self)
+function proto.package_name(self)
        return "uqmi"
 end
 

diff --git a/modules/luci-compat/luasrc/model/network/proto_relay.lua b/modules/luci-compat/luasrc/model/network/proto_relay.lua
index 3b811d44d11c7ed0c32000da007b3f25b7f367ab..f02b5dcc5f2644431ed4ac7bf3b10bfd78db0c70 100644 (file)
--- a/modules/luci-compat/luasrc/model/network/proto_relay.lua
+++ b/modules/luci-compat/luasrc/model/network/proto_relay.lua
@@ -16,7 +16,7 @@ function proto.ifname(self)
        return "relay-" .. self.sid
 end
 
-function proto.opkg_package(self)
+function proto.package_name(self)
        return "relayd"
 end
 

diff --git a/modules/luci-compat/luasrc/model/network/proto_vpnc.lua b/modules/luci-compat/luasrc/model/network/proto_vpnc.lua
index 9a269a1283db5e70005da863718db31b24bf76f2..06ef9a26ab44ba5d4d4d5309ad82a7298e96356f 100644 (file)
--- a/modules/luci-compat/luasrc/model/network/proto_vpnc.lua
+++ b/modules/luci-compat/luasrc/model/network/proto_vpnc.lua
@@ -17,7 +17,7 @@ function proto.get_interface(self)
        return interface(self:ifname(), self)
 end
 
-function proto.opkg_package(self)
+function proto.package_name(self)
        return "vpnc"
 end
 

diff --git a/modules/luci-compat/luasrc/model/network/proto_wireguard.lua b/modules/luci-compat/luasrc/model/network/proto_wireguard.lua
index d6937618a7f0c1c0403692b85c10d957c0cb2dec..8c73ac5b91477b5a637e80c01e6214bc3aa8d6d3 100644 (file)
--- a/modules/luci-compat/luasrc/model/network/proto_wireguard.lua
+++ b/modules/luci-compat/luasrc/model/network/proto_wireguard.lua
@@ -17,7 +17,7 @@ function proto.get_interface(self)
   return interface(self:ifname(), self)
 end
 
-function proto.opkg_package(self)
+function proto.package_name(self)
   return "wireguard-tools"
 end