Page MenuHomeFreeBSD
Files F157328734

D53238.diff
No OneTemporary
Actions

D53238.diff
View Options

diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua
--- a/libexec/nuageinit/nuage.lua
+++ b/libexec/nuageinit/nuage.lua
@@ -69,7 +69,7 @@
end
local function chmod(path, mode)
- local mode = tonumber(mode, 8)
+ mode = tonumber(mode, 8)
local _, err, msg = sys_stat.chmod(path, mode)
if err then
errmsg("chmod(" .. path .. ", " .. mode .. ") failed: " .. msg)
@@ -150,8 +150,6 @@
end
local function getgroups()
- local ret = {}
-
local root = os.getenv("NUAGE_FAKE_ROOTDIR")
local cmd = "pw "
if root then
@@ -579,7 +577,7 @@
root = "/"
end
- f, _, rc = os.execute("tzsetup -s -C " .. root .. " " .. timezone)
+ local f, _, rc = os.execute("tzsetup -s -C " .. root .. " " .. timezone)
if not f then
warnmsg("Impossible to configure time zone ( rc = " .. rc .. " )")
diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit
--- a/libexec/nuageinit/nuageinit
+++ b/libexec/nuageinit/nuageinit
@@ -229,10 +229,10 @@
local resolv_conf = root .. "/etc/resolv.conf"
- resolv_conf_attr = lfs.attributes(resolv_conf)
+ local resolv_conf_attr = lfs.attributes(resolv_conf)
if resolv_conf_attr == nil then
- resolv_conf_handler = open_resolv_conf()
+ local resolv_conf_handler = open_resolv_conf()
resolv_conf_handler:close()
end
@@ -295,10 +295,11 @@
-- with the matching interfaces must be returned. This changes the way we initially
-- thought about our implementation, since at first we only needed one interface,
-- but cloud-init performs actions on a group of matching interfaces.
+ local interface
local interfaces = {}
if rules.macaddress then
local ifaces = get_ifaces_by_mac()
- local interface = ifaces[rules.macaddress]
+ interface = ifaces[rules.macaddress]
if not interface then
nuage.warn("not interface matching by MAC address: " .. rules.macaddress)
return
@@ -348,11 +349,11 @@
end
end
-local function write_files_not_defered(obj)
+local function write_files_not_deferred(obj)
write_files(obj.write_files, false)
end
-local function write_files_defered(obj)
+local function write_files_deferred(obj)
write_files(obj.write_files, true)
end
-- Set network configuration from user_data
@@ -381,6 +382,7 @@
extra_opts = extra_opts .. " wol"
end
if v.mtu then
+ local mtu
if type(v.mtu) == "number" then
mtu = tostring(v.mtu)
else
@@ -680,14 +682,14 @@
network_config,
ssh_pwauth,
runcmd,
- write_files_not_defered,
+ write_files_not_deferred,
}
local post_network_calls = {
packages,
users,
chpasswd,
- write_files_defered,
+ write_files_deferred,
}
f = io.open(ni_path .. "/" .. ud)
@@ -704,12 +706,8 @@
for i = 1, #calls_table do
if citype == "nocloud" and calls_table[i] == network_config then
- netobj = parse_network_config()
- if netobj == nil then
- network_config(obj)
- else
- network_config(netobj)
- end
+ local netobj = parse_network_config() or obj
+ network_config(netobj)
else
calls_table[i](obj)
end
diff --git a/libexec/nuageinit/tests/addfile.lua b/libexec/nuageinit/tests/addfile.lua
--- a/libexec/nuageinit/tests/addfile.lua
+++ b/libexec/nuageinit/tests/addfile.lua
@@ -35,7 +35,7 @@
n.err("Invalid file content")
end
--- the file is overwriten
+-- the file is overwritten
f.content = "test"
str = addfile_and_getres(f)
diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh
--- a/libexec/nuageinit/tests/nuageinit.sh
+++ b/libexec/nuageinit/tests/nuageinit.sh
@@ -890,7 +890,7 @@
atf_check -o inline:"plop" cat file1
atf_check -o inline:"" cat emptyfile
atf_check -o inline:"bla\n" cat file_base64
- test -f foo && atf_fail "foo creation should have been defered"
+ test -f foo && atf_fail "foo creation should have been deferred"
atf_check -o match:"^-rwxr-xr-x.*nobody" ls -l file_base64
rm file1 emptyfile file_base64
atf_check -o empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet

File Metadata

Mime Type
text/plain
Expires
Thu, May 21, 9:17 AM (42 m, 53 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33383826
Default Alt Text
D53238.diff (3 KB)

Event Timeline