summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lvm2-controller.lua5
-rw-r--r--lvm2-details-html.lsp6
-rw-r--r--lvm2-model.lua12
l---------lvm2-startstop-html.lsp1
4 files changed, 12 insertions, 12 deletions
diff --git a/lvm2-controller.lua b/lvm2-controller.lua
index 14e4b24..23ea1b0 100644
--- a/lvm2-controller.lua
+++ b/lvm2-controller.lua
@@ -1,8 +1,5 @@
module(..., package.seeall)
--- Load libraries
-require("controllerfunctions")
-
default_action = "status"
function status(self)
@@ -10,7 +7,7 @@ function status(self)
end
function startstop(self)
- return controllerfunctions.handle_startstop(self, self.model.startstop_service, self.clientdata)
+ return self.handle_form(self, self.model.get_startstop, self.model.startstop_service, self.clientdata)
end
function details(self)
diff --git a/lvm2-details-html.lsp b/lvm2-details-html.lsp
index 0f55add..b26ed0a 100644
--- a/lvm2-details-html.lsp
+++ b/lvm2-details-html.lsp
@@ -1,5 +1,5 @@
<% local data, viewlibrary = ...
-require("viewfunctions")
+require("htmlviewfunctions")
%>
<% viewlibrary.dispatch_component("status") %>
@@ -7,7 +7,7 @@ require("viewfunctions")
<H2><%= html.html_escape(data.label) %></H2>
<DL>
<%
-displayitem(data.value.pvdisplay)
-displayitem(data.value.lvdisplay)
+htmlviewfunctions.displayitem(data.value.pvdisplay)
+htmlviewfunctions.displayitem(data.value.lvdisplay)
%>
</DL>
diff --git a/lvm2-model.lua b/lvm2-model.lua
index b979b94..9a75d62 100644
--- a/lvm2-model.lua
+++ b/lvm2-model.lua
@@ -2,8 +2,8 @@ module(..., package.seeall)
-- Load libraries
require("modelfunctions")
-require("fs")
-require("format")
+fs = require("acf.fs")
+format = require("acf.format")
-- Set variables
local processname = "lvm"
@@ -17,8 +17,12 @@ local path = "PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin
-- ################################################################################
-- PUBLIC FUNCTIONS
-function startstop_service(action)
- return modelfunctions.startstop_service(processname, action)
+function get_startstop(clientdata)
+ return modelfunctions.get_startstop(processname)
+end
+
+function startstop_service(startstop, action)
+ return modelfunctions.startstop_service(startstop, action)
end
function getstatus()
diff --git a/lvm2-startstop-html.lsp b/lvm2-startstop-html.lsp
deleted file mode 120000
index 0ea2627..0000000
--- a/lvm2-startstop-html.lsp
+++ /dev/null
@@ -1 +0,0 @@
-../startstop-html.lsp \ No newline at end of file