luci-base: replace luci/getHostname with generic file/read rpc operation

[project/luci.git] / modules / luci-base / htdocs / luci-static / resources / protocol / dhcp.js

diff --git a/modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js b/modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js
index b0b65974a8914e4745eb5dc6aa5b3ca1ad5efa33..f0a3ec579c2e8d98cdcab91b0df8111ddb8504d3 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js
+++ b/modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js
@@ -3,10 +3,12 @@
 'require form';
 'require network';
 
-var callHostname = rpc.declare({
-       object: 'luci',
-       method: 'getHostname',
-       expect: { result: '' }
+var callFileRead = rpc.declare({
+       object: 'file',
+       method: 'read',
+       params: [ 'path' ],
+       expect: { data: '' },
+       filter: function(value) { return value.trim() }
 });
 
 return network.registerProtocol('dhcp', {
@@ -20,7 +22,7 @@ return network.registerProtocol('dhcp', {
                o = s.taboption('general', form.Value, 'hostname', _('Hostname to send when requesting DHCP'));
                o.datatype    = 'hostname';
                o.load = function(section_id) {
-                       return callHostname().then(L.bind(function(hostname) {
+                       return callFileRead('/proc/sys/kernel/hostname').then(L.bind(function(hostname) {
                                this.placeholder = hostname;
                                return form.Value.prototype.load.apply(this, [section_id]);
                        }, this));