The branch stable/14 has been updated by bapt:
URL:
https://cgit.FreeBSD.org/src/commit/?id=bb3bc92f4df63bf4b071816de04605d3033e390a
commit bb3bc92f4df63bf4b071816de04605d3033e390a
Author: Baptiste Daroussin <b...@freebsd.org>
AuthorDate: 2025-06-16 08:23:27 +0000
Commit: Baptiste Daroussin <b...@freebsd.org>
CommitDate: 2025-06-23 07:43:13 +0000
nuageinit: add a post network script
refactor nuageinit to allow a 3rd execution point during boot:
1. nuageinit is invoked before NETWORKING with a minimalistic network setup
for openstrack and potentially other network config setup. it tries
to configure everything which is not requiring any network.
2. nuageinit is invoked again post NETWORKING but pre SERVERS, in the
phase it does all that requires network, like dealing with packages.
Note that creating users have been moved to this phase to allow the
installation of shells like bash or zsh prior the creation of the
users, before that the user creation was failing if a non installed
shell was requested.
3. nuageinit will execute at the rc.local time all the specified scripts
and commands.
MFC After: 1 week
(cherry picked from commit 2a05d577ab30dcefcf51def4c65a64af30610c85)
---
libexec/nuageinit/nuageinit | 399 ++++++++++++++++++++---------------
libexec/nuageinit/tests/nuageinit.sh | 34 +--
libexec/rc/rc.d/Makefile | 1 +
libexec/rc/rc.d/nuageinit_post_net | 25 +++
4 files changed, 275 insertions(+), 184 deletions(-)
diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit
index d8aa734cb122..ecad3feb7ad4 100755
--- a/libexec/nuageinit/nuageinit
+++ b/libexec/nuageinit/nuageinit
@@ -69,6 +69,109 @@ local function get_ifaces()
return myifaces
end
+local function sethostname(obj)
+ -- always prefer fqdn is specified over hostname
+ if obj.fqdn then
+ nuage.sethostname(obj.fqdn)
+ elseif obj.hostname then
+ nuage.sethostname(obj.hostname)
+ end
+end
+
+local function groups(obj)
+ if obj.groups == nil then return end
+
+ for n, g in pairs(obj.groups) do
+ if (type(g) == "string") then
+ local r = nuage.addgroup({name = g})
+ if not r then
+ nuage.warn("failed to add group: " .. g)
+ end
+ elseif type(g) == "table" then
+ for k, v in pairs(g) do
+ nuage.addgroup({name = k, members = v})
+ end
+ else
+ nuage.warn("invalid type: " .. type(g) .. " for users
entry number " .. n)
+ end
+ end
+end
+
+local function create_default_user(obj)
+ if not obj.users then
+ -- default user if none are defined
+ nuage.adduser(default_user)
+ end
+end
+
+local function users(obj)
+ if obj.users == nil then return end
+
+ for n, u in pairs(obj.users) do
+ if type(u) == "string" then
+ if u == "default" then
+ nuage.adduser(default_user)
+ else
+ nuage.adduser({name = u})
+ end
+ elseif type(u) == "table" then
+ -- ignore users without a username
+ if u.name == nil then
+ goto unext
+ end
+ local homedir = nuage.adduser(u)
+ if u.ssh_authorized_keys then
+ for _, v in ipairs(u.ssh_authorized_keys) do
+ nuage.addsshkey(homedir, v)
+ end
+ end
+ if u.sudo then
+ nuage.addsudo(u)
+ end
+ else
+ nuage.warn("invalid type : " .. type(u) .. " for users
entry number " .. n)
+ end
+ ::unext::
+ end
+end
+
+local function ssh_keys(obj)
+ if obj.ssh_keys == nil then return end
+ if type(obj.ssh_keys) ~= "table" then
+ nuage.warn("Invalid type for ssh_keys")
+ return
+ end
+
+ for key, val in pairs(obj.ssh_keys) do
+ for keyname, keytype in key:gmatch("(%w+)_(%w+)") do
+ local sshkn = nil
+ if keytype == "public" then
+ sshkn = "ssh_host_" .. keyname .. "_key.pub"
+ elseif keytype == "private" then
+ sshkn = "ssh_host_" .. keyname .. "_key"
+ end
+ if sshkn then
+ local sshkey, path = open_ssh_key(sshkn)
+ if sshkey then
+ sshkey:write(val .. "\n")
+ sshkey:close()
+ end
+ if keytype == "private" then
+ sys_stat.chmod(path, 384)
+ end
+ end
+ end
+ end
+end
+
+local function ssh_authorized_keys(obj)
+ if obj.ssh_authorized_keys == nil then return end
+ local homedir = nuage.adduser(default_user)
+ for _, k in ipairs(obj.ssh_authorized_keys) do
+ nuage.addsshkey(homedir, k)
+ end
+end
+
local function install_packages(packages)
if not nuage.pkg_bootstrap() then
nuage.warn("Failed to bootstrap pkg, skip installing packages")
@@ -80,11 +183,106 @@ local function install_packages(packages)
nuage.warn("Failed to install : " .. p)
end
else
- nuage.warn("Invalid type : " .. type(p) .. " for
packages entry number " .. n)
+ nuage.warn("Invalid type: " .. type(p) .. " for
packages entry number " .. n)
end
end
end
+-- Set network configuration from user_data
+local function network_config(obj)
+ if obj.network == nil then return end
+
+ local ifaces = get_ifaces()
+ local network = open_config("network")
+ local routing = open_config("routing")
+ local ipv6 = {}
+ for _, v in pairs(obj.network.ethernets) do
+ if not v.match then
+ goto next
+ end
+ if not v.match.macaddress then
+ goto next
+ end
+ if not ifaces[v.match.macaddress] then
+ nuage.warn("not interface matching: " ..
v.match.macaddress)
+ goto next
+ end
+ local interface = ifaces[v.match.macaddress]
+ if v.dhcp4 then
+ network:write("ifconfig_" .. interface .. '="DHCP"\n')
+ elseif v.addresses then
+ for _, a in pairs(v.addresses) do
+ if a:match("^(%d+)%.(%d+)%.(%d+)%.(%d+)") then
+ network:write("ifconfig_" .. interface
.. '="inet ' .. a .. '"\n')
+ else
+ network:write("ifconfig_" .. interface
.. '_ipv6="inet6 ' .. a .. '"\n')
+ ipv6[#ipv6 + 1] = interface
+ end
+ end
+ end
+ if v.gateway4 then
+ routing:write('defaultrouter="' .. v.gateway4 .. '"\n')
+ end
+ if v.gateway6 then
+ routing:write('ipv6_defaultrouter="' .. v.gateway6 ..
'"\n')
+ routing:write("ipv6_route_" .. interface .. '="' ..
v.gateway6)
+ routing:write(" -prefixlen 128 -interface " ..
interface .. '"\n')
+ end
+ ::next::
+ end
+ if #ipv6 > 0 then
+ network:write('ipv6_network_interfaces="')
+ network:write(table.concat(ipv6, " ") .. '"\n')
+ network:write('ipv6_default_interface="' .. ipv6[1] .. '"\n')
+ end
+ network:close()
+ routing:close()
+end
+
+local function ssh_pwauth(obj)
+ if obj.ssh_pwauth == nil then return end
+
+ local value = "no"
+ if obj.ssh_pwauth then
+ value = "yes"
+ end
+ nuage.update_sshd_config("PasswordAuthentication", value)
+end
+
+local function runcmd(obj)
+ if obj.runcmd == nil then return end
+ local f = nil
+ for _, c in ipairs(obj.runcmd) do
+ if f == nil then
+ nuage.mkdir_p(root .. "/var/cache/nuageinit")
+ f = assert(io.open(root ..
"/var/cache/nuageinit/runcmds", "w"))
+ f:write("#!/bin/sh\n")
+ end
+ f:write(c .. "\n")
+ end
+ if f ~= nil then
+ f:close()
+ sys_stat.chmod(root .. "/var/cache/nuageinit/runcmds", 493)
+ end
+end
+
+local function packages(obj)
+ if obj.package_update then
+ nuage.update_packages()
+ end
+ if obj.package_upgrade then
+ nuage.upgrade_packages()
+ end
+ if obj.packages then
+ install_packages(obj.packages)
+ end
+end
+
+local function chpasswd(obj)
+ if obj.chpasswd == nil then return end
+ nuage.chpasswd(obj.chpasswd)
+end
+
local function config2_network(p)
local parser = ucl.parser()
local f = io.open(p .. "/network_data.json")
@@ -222,7 +420,7 @@ elseif citype == "nocloud" then
if hostname then
nuage.sethostname(hostname)
end
-else
+elseif citype ~= "postnet" then
nuage.err("Unknown cloud init type: " .. citype)
end
@@ -241,185 +439,48 @@ if not f then
os.exit(0)
end
local line = f:read("*l")
+if citype ~= "postnet" then
+ local content = f:read("*a")
+ nuage.mkdir_p(root .. "/var/cache/nuageinit")
+ local tof = assert(io.open(root .. "/var/cache/nuageinit/user_data",
"w"))
+ tof:write(line .. "\n" .. content)
+ tof:close()
+end
f:close()
if line == "#cloud-config" then
+ local pre_network_calls = {
+ sethostname,
+ groups,
+ create_default_user,
+ ssh_keys,
+ ssh_authorized_keys,
+ network_config,
+ ssh_pwauth,
+ runcmd
+ }
+
+ local post_network_calls = {
+ packages,
+ users,
+ chpasswd
+ }
+
f = io.open(ni_path .. "/" .. ud)
local obj = yaml.eval(f:read("*a"))
f:close()
if not obj then
nuage.err("error parsing cloud-config file: " .. ud)
end
- -- always prefer fqdn is specified over hostname
- if obj.fqdn then
- nuage.sethostname(obj.fqdn)
- elseif obj.hostname then
- nuage.sethostname(obj.hostname)
- end
- if obj.groups then
- for n, g in pairs(obj.groups) do
- if (type(g) == "string") then
- local r = nuage.addgroup({name = g})
- if not r then
- nuage.warn("failed to add group: " .. g)
- end
- elseif type(g) == "table" then
- for k, v in pairs(g) do
- nuage.addgroup({name = k, members = v})
- end
- else
- nuage.warn("invalid type: " .. type(g) .. " for
users entry number " .. n)
- end
- end
- end
- if obj.users then
- for n, u in pairs(obj.users) do
- if type(u) == "string" then
- if u == "default" then
- nuage.adduser(default_user)
- else
- nuage.adduser({name = u})
- end
- elseif type(u) == "table" then
- -- ignore users without a username
- if u.name == nil then
- goto unext
- end
- local homedir = nuage.adduser(u)
- if u.ssh_authorized_keys then
- for _, v in
ipairs(u.ssh_authorized_keys) do
- nuage.addsshkey(homedir, v)
- end
- end
- if u.sudo then
- nuage.addsudo(u)
- end
- else
- nuage.warn("invalid type : " .. type(u) .. "
for users entry number " .. n)
- end
- ::unext::
- end
- else
- -- default user if none are defined
- nuage.adduser(default_user)
- end
- if obj.ssh_keys and type(obj.ssh_keys) == "table" then
- for key, val in pairs(obj.ssh_keys) do
- for keyname, keytype in key:gmatch("(%w+)_(%w+)") do
- local sshkn = nil
- if keytype == "public" then
- sshkn = "ssh_host_" .. keyname ..
"_key.pub"
- elseif keytype == "private" then
- sshkn = "ssh_host_" .. keyname .. "_key"
- end
- if sshkn then
- local sshkey, path = open_ssh_key(sshkn)
- if sshkey then
- sshkey:write(val .. "\n")
- sshkey:close()
- end
- if keytype == "private" then
- sys_stat.chmod(path, 384)
- end
- end
- end
- end
- end
- if obj.ssh_authorized_keys then
- local homedir = nuage.adduser(default_user)
- for _, k in ipairs(obj.ssh_authorized_keys) do
- nuage.addsshkey(homedir, k)
- end
- end
- if obj.network then
- local ifaces = get_ifaces()
- local network = open_config("network")
- local routing = open_config("routing")
- local ipv6 = {}
- for _, v in pairs(obj.network.ethernets) do
- if not v.match then
- goto next
- end
- if not v.match.macaddress then
- goto next
- end
- if not ifaces[v.match.macaddress] then
- nuage.warn("not interface matching: " ..
v.match.macaddress)
- goto next
- end
- local interface = ifaces[v.match.macaddress]
- if v.dhcp4 then
- network:write("ifconfig_" .. interface ..
'="DHCP"\n')
- elseif v.addresses then
- for _, a in pairs(v.addresses) do
- if
a:match("^(%d+)%.(%d+)%.(%d+)%.(%d+)") then
- network:write("ifconfig_" ..
interface .. '="inet ' .. a .. '"\n')
- else
- network:write("ifconfig_" ..
interface .. '_ipv6="inet6 ' .. a .. '"\n')
- ipv6[#ipv6 + 1] = interface
- end
- end
- end
- if v.gateway4 then
- routing:write('defaultrouter="' .. v.gateway4
.. '"\n')
- end
- if v.gateway6 then
- routing:write('ipv6_defaultrouter="' ..
v.gateway6 .. '"\n')
- routing:write("ipv6_route_" .. interface ..
'="' .. v.gateway6)
- routing:write(" -prefixlen 128 -interface " ..
interface .. '"\n')
- end
- ::next::
- end
- if #ipv6 > 0 then
- network:write('ipv6_network_interfaces="')
- network:write(table.concat(ipv6, " ") .. '"\n')
- network:write('ipv6_default_interface="' .. ipv6[1] ..
'"\n')
- end
- network:close()
- routing:close()
- end
- if obj.ssh_pwauth ~= nil then
- local value = "no"
- if obj.ssh_pwauth then
- value = "yes"
- end
- nuage.update_sshd_config("PasswordAuthentication", value)
- end
- if obj.chpasswd ~= nil then
- nuage.chpasswd(obj.chpasswd)
- end
- if obj.runcmd then
- f = nil
- for _, c in ipairs(obj.runcmd) do
- if f == nil then
- nuage.mkdir_p(root .. "/var/cache/nuageinit")
- f = assert(io.open(root ..
"/var/cache/nuageinit/runcmds", "w"))
- f:write("#!/bin/sh\n")
- end
- f:write(c .. "\n")
- end
- if f ~= nil then
- f:close()
- sys_stat.chmod(root .. "/var/cache/nuageinit/runcmds",
493)
- end
- end
- if obj.packages then
- install_packages(obj.packages)
- end
- if obj.package_update then
- nuage.update_packages()
+ local calls_table = pre_network_calls
+ if citype == "postnet" then
+ calls_table = post_network_calls
end
- if obj.package_upgrade then
- nuage.upgrade_packages()
+
+ for i = 1, #calls_table do
+ calls_table[i](obj)
end
elseif line:sub(1, 2) == "#!" then
-- delay for execution at rc.local time --
- f = io.open(ni_path .. "/" .. ud)
- local content = f:read("*a")
- f:close()
- nuage.mkdir_p(root .. "/var/cache/nuageinit")
- f = assert(io.open(root .. "/var/cache/nuageinit/user_data", "w"))
- f:write(content)
- f:close()
sys_stat.chmod(root .. "/var/cache/nuageinit/user_data", 493)
end
diff --git a/libexec/nuageinit/tests/nuageinit.sh
b/libexec/nuageinit/tests/nuageinit.sh
index fe799a2227f3..0e6335a382d2 100644
--- a/libexec/nuageinit/tests/nuageinit.sh
+++ b/libexec/nuageinit/tests/nuageinit.sh
@@ -122,6 +122,7 @@ users:
passwd:
$6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/
EOF
atf_check /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud
+ atf_check /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet
cat > expectedgroup << EOF
wheel:*:0:root,freebsd
users:*:1:foobar
@@ -568,7 +569,8 @@ chpasswd:
- { user: "sys", password: RANDOM }
EOF
- atf_check -o empty -e inline:"nuageinit: Invalid entry for
chpasswd.users: missing 'name'\n" /usr/libexec/nuageinit
"${PWD}"/media/nuageinit nocloud
+ atf_check -o empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit
nocloud
+ atf_check -o empty -e inline:"nuageinit: Invalid entry for
chpasswd.users: missing 'name'\n" /usr/libexec/nuageinit
"${PWD}"/media/nuageinit postnet
# nothing modified
atf_check -o inline:"sys:*:1:0::0:0:Sys:/home/sys:/bin/sh\n" pw -R
$(pwd) usershow sys
@@ -579,7 +581,7 @@ chpasswd:
users:
- { name: "sys", pwd: RANDOM }
EOF
- atf_check -o empty -e inline:"nuageinit: Invalid entry for
chpasswd.users: missing 'password'\n" /usr/libexec/nuageinit
"${PWD}"/media/nuageinit nocloud
+ atf_check -o empty -e inline:"nuageinit: Invalid entry for
chpasswd.users: missing 'password'\n" /usr/libexec/nuageinit
"${PWD}"/media/nuageinit postnet
# nothing modified
atf_check -o inline:"sys:*:1:0::0:0:Sys:/home/sys:/bin/sh\n" pw -R
$(pwd) usershow sys
@@ -591,7 +593,7 @@ chpasswd:
- { name: "sys", password: RANDOM }
EOF
# not empty because the password is printed to stdout
- atf_check -o empty -e empty /usr/libexec/nuageinit
"${PWD}"/media/nuageinit nocloud
+ atf_check -o empty -e empty /usr/libexec/nuageinit
"${PWD}"/media/nuageinit postnet
atf_check -o match:'sys:\$.*:1:0::0:0:Sys:/home/sys:/bin/sh$' pw -R
$(pwd) usershow sys
cat > media/nuageinit/user-data << 'EOF'
@@ -602,7 +604,7 @@ chpasswd:
- { name: "sys", password: RANDOM }
EOF
# not empty because the password is printed to stdout
- atf_check -o empty -e empty /usr/libexec/nuageinit
"${PWD}"/media/nuageinit nocloud
+ atf_check -o empty -e empty /usr/libexec/nuageinit
"${PWD}"/media/nuageinit postnet
atf_check -o match:'sys:\$.*:1:0::1:0:Sys:/home/sys:/bin/sh$' pw -R
$(pwd) usershow sys
cat > media/nuageinit/user-data << 'EOF'
@@ -613,7 +615,7 @@ chpasswd:
- { name: "user", password:
"$6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/"
}
EOF
# not empty because the password is printed to stdout
- atf_check -o empty -e empty /usr/libexec/nuageinit
"${PWD}"/media/nuageinit nocloud
+ atf_check -o empty -e empty /usr/libexec/nuageinit
"${PWD}"/media/nuageinit postnet
atf_check -o
inline:'user:$6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/:1:0::1:0:Sys:/home/sys:/bin/sh\n'
pw -R $(pwd) usershow user
}
@@ -645,7 +647,8 @@ chpasswd:
sys:RANDOM
EOF
- atf_check -o empty -e inline:"nuageinit: chpasswd.list is deprecated
consider using chpasswd.users\n" /usr/libexec/nuageinit
"${PWD}"/media/nuageinit nocloud
+ atf_check -o empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit
nocloud
+ atf_check -o empty -e inline:"nuageinit: chpasswd.list is deprecated
consider using chpasswd.users\n" /usr/libexec/nuageinit
"${PWD}"/media/nuageinit postnet
atf_check -o match:'sys:\$.*:1:0::1:0:Sys:/home/sys:/bin/sh$' pw -R
$(pwd) usershow sys
cat > media/nuageinit/user-data << 'EOF'
@@ -658,7 +661,7 @@ chpasswd:
root:R
EOF
- atf_check -o empty -e ignore /usr/libexec/nuageinit
"${PWD}"/media/nuageinit nocloud
+ atf_check -o empty -e ignore /usr/libexec/nuageinit
"${PWD}"/media/nuageinit postnet
atf_check -o match:'sys:\$.*:1:0::0:0:Sys:/home/sys:/bin/sh$' pw -R
$(pwd) usershow sys
atf_check -o
inline:'user:$6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/:1:0::0:0:Sys:/home/sys:/bin/sh\n'
pw -R $(pwd) usershow user
atf_check -o match:'root:\$.*:0:0::0:0:Charlie &:/root:/bin/sh$' pw -R
$(pwd) usershow root
@@ -691,7 +694,8 @@ chpasswd:
- sys:RANDOM
EOF
- atf_check -o empty -e inline:"nuageinit: chpasswd.list is deprecated
consider using chpasswd.users\n" /usr/libexec/nuageinit
"${PWD}"/media/nuageinit nocloud
+ atf_check -o empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit
nocloud
+ atf_check -o empty -e inline:"nuageinit: chpasswd.list is deprecated
consider using chpasswd.users\n" /usr/libexec/nuageinit
"${PWD}"/media/nuageinit postnet
atf_check -o match:'sys:\$.*:1:0::1:0:Sys:/home/sys:/bin/sh$' pw -R
$(pwd) usershow sys
cat > media/nuageinit/user-data << 'EOF'
@@ -704,7 +708,7 @@ chpasswd:
- root:R
EOF
- atf_check -o empty -e ignore /usr/libexec/nuageinit
"${PWD}"/media/nuageinit nocloud
+ atf_check -o empty -e ignore /usr/libexec/nuageinit
"${PWD}"/media/nuageinit postnet
atf_check -o match:'sys:\$.*:1:0::0:0:Sys:/home/sys:/bin/sh$' pw -R
$(pwd) usershow sys
atf_check -o
inline:'user:$6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/:1:0::0:0:Sys:/home/sys:/bin/sh\n'
pw -R $(pwd) usershow user
atf_check -o match:'root:\$.*:0:0::0:0:Charlie &:/root:/bin/sh$' pw -R
$(pwd) usershow root
@@ -763,14 +767,14 @@ config2_userdata_packages_body()
packages:
EOF
chmod 755 "${PWD}"/media/nuageinit/user_data
- atf_check -s exit:1 -e match:"attempt to index a nil value"
/usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2
+ atf_check -s exit:1 -e match:"attempt to index a nil value"
/usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet
cat > media/nuageinit/user_data << 'EOF'
#cloud-config
packages:
- yeah/plop
EOF
chmod 755 "${PWD}"/media/nuageinit/user_data
- atf_check -s exit:0 -o inline:"pkg install -y yeah/plop\npkg info -q
yeah/plop\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2
+ atf_check -s exit:0 -o inline:"pkg install -y yeah/plop\npkg info -q
yeah/plop\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet
cat > media/nuageinit/user_data << 'EOF'
#cloud-config
@@ -778,7 +782,7 @@ packages:
- curl
EOF
chmod 755 "${PWD}"/media/nuageinit/user_data
- atf_check -o inline:"pkg install -y curl\npkg info -q curl\n"
/usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2
+ atf_check -o inline:"pkg install -y curl\npkg info -q curl\n"
/usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet
cat > media/nuageinit/user_data << 'EOF'
#cloud-config
@@ -787,7 +791,7 @@ packages:
- meh: bla
EOF
chmod 755 "${PWD}"/media/nuageinit/user_data
- atf_check -o inline:"pkg install -y curl\npkg info -q curl\n" -e
inline:"nuageinit: Invalid type : table for packages entry number 2\n"
/usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2
+ atf_check -o inline:"pkg install -y curl\npkg info -q curl\n" -e
inline:"nuageinit: Invalid type : table for packages entry number 2\n"
/usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet
}
config2_userdata_update_packages_body()
@@ -801,7 +805,7 @@ config2_userdata_update_packages_body()
package_update: true
EOF
chmod 755 "${PWD}"/media/nuageinit/user_data
- atf_check -o inline:"pkg update -y\n" /usr/libexec/nuageinit
"${PWD}"/media/nuageinit config-2
+ atf_check -o inline:"pkg update -y\n" /usr/libexec/nuageinit
"${PWD}"/media/nuageinit postnet
}
config2_userdata_upgrade_packages_body()
@@ -815,7 +819,7 @@ config2_userdata_upgrade_packages_body()
package_upgrade: true
EOF
chmod 755 "${PWD}"/media/nuageinit/user_data
- atf_check -o inline:"pkg upgrade -y\n" /usr/libexec/nuageinit
"${PWD}"/media/nuageinit config-2
+ atf_check -o inline:"pkg upgrade -y\n" /usr/libexec/nuageinit
"${PWD}"/media/nuageinit postnet
}
config2_userdata_shebang_body()
diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile
index 23a3426e5d0a..ef2e7b43f9ed 100644
--- a/libexec/rc/rc.d/Makefile
+++ b/libexec/rc/rc.d/Makefile
@@ -317,6 +317,7 @@ SMRCDPACKAGE= sendmail
.if ${MK_NUAGEINIT} != "no"
CONFGROUPS+= NIUAGEINIT
NIUAGEINIT= nuageinit \
+ nuageinit_post_net \
nuageinit_user_data_script
NIUAGEINITPACKAGE= nuageinit
.endif
diff --git a/libexec/rc/rc.d/nuageinit_post_net
b/libexec/rc/rc.d/nuageinit_post_net
new file mode 100755
index 000000000000..bea4c5e37c5f
--- /dev/null
+++ b/libexec/rc/rc.d/nuageinit_post_net
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+
+# PROVIDE: nuageinit_post_net
+# REQUIRE: NETWORKING devfs
+# BEFORE: SERVERS
+# KEYWORD: firstboot
+
+. /etc/rc.subr
+
+name="nuageinit_post_net"
+desc="Post Network Cloud Init configuration"
+start_cmd="execute_post_net"
+stop_cmd=":"
+rcvar="nuageinit_enable"
+
+execute_post_net()
+{
+ test -f /var/cache/nuageinit/post_network_config || return
+ /usr/libexec/nuageinit /var/cache/nuageinit/post_network_config | tee
-a /var/log/nuageinit.log
+}
+
+# Share the same config as nuageinit
+load_rc_config nuageinit
+run_rc_command "$1"
