system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-09 04:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

nuageinit: use pw(8) instead of getent(1)

Browse Source 
pw(8) allows to seek for users in a custom rootdir, which makes it
easier for a testsuite

MFC After:	3 days
This commit is contained in:
Baptiste Daroussin 2024-06-05 10:34:25 +02:00
parent 41dfea24ee
commit 83fcab792c
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libexec/nuageinit/nuage.lua
View File

@ -72,7 +72,12 @@ local function adduser(pwd)
warnmsg("Argument should be a table")
return nil
end
local f = io.popen("getent passwd "..pwd.name)
local root = os.getenv("NUAGE_FAKE_ROOTDIR")
local cmd = "pw "
if root then
cmd = cmd .. "-R " .. root .. " "
end
local f = io.popen(cmd .. " usershow " ..pwd.name .. " -7 2>/dev/null")
local pwdstr = f:read("*a")
f:close()
if pwdstr:len() ~= 0 then
@ -109,8 +114,7 @@ local function adduser(pwd)
precmd = "echo "..pwd.plain_text_passwd .. "| "
postcmd = " -H 0 "
end
local root = os.getenv("NUAGE_FAKE_ROOTDIR")
local cmd = precmd .. "pw "
cmd = precmd .. "pw "
if root then
cmd = cmd .. "-R " .. root .. " "
end
@ -140,7 +144,12 @@ local function addgroup(grp)
warnmsg("Argument should be a table")
return false
end
local f = io.popen("getent group "..grp.name)
local root = os.getenv("NUAGE_FAKE_ROOTDIR")
local cmd = "pw "
if root then
cmd = cmd .. "-R " .. root .. " "
end
local f = io.popen(cmd .. " groupshow " ..grp.name .. " 2>/dev/null")
local grpstr = f:read("*a")
f:close()
if grpstr:len() ~= 0 then
@ -151,8 +160,7 @@ local function addgroup(grp)
local list = splitlist(grp.members)
extraargs = " -M " .. table.concat(list, ',')
end
local root = os.getenv("NUAGE_FAKE_ROOTDIR")
local cmd = "pw "
cmd = "pw "
if root then
cmd = cmd .. "-R " .. root .. " "
end