summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2014-02-10 13:28:26 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-11 12:04:38 +0000
commit287efe1494467e464f7867b91726e85b326c3178 (patch)
treeb186e23652c781d28cea97b847b735d13614160f
parent39d9414b952027f3d07fe0929c9ad29b9c2d40c1 (diff)
downloadpoky-287efe1494467e464f7867b91726e85b326c3178.tar.gz
useradd-staticids: Adjust USERADD_ERROR_DYNAMIC condition and error message
The USERADD_ERROR_DYNAMIC needs to check that both users and groups that are defined need to be represented as static ids, or an error should occur. For the user check, we want to make sure the uid is a numeric value. (The gid can be name, as the GROUPADD check will validate for a number there -- or during install useradd will fail if that group is not defined.) For the group check, we verify that the gid is specified and not left as a name. Also two statements that can be uncommented for debugging were added so that future development work on this code would be easier to do. (From OE-Core rev: f35bbba65e3e41f8dea1f9ff872d3a9fbd84bf6d) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/useradd-staticids.bbclass8
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass
index 5897fed20d..3efe2a895a 100644
--- a/meta/classes/useradd-staticids.bbclass
+++ b/meta/classes/useradd-staticids.bbclass
@@ -134,8 +134,9 @@ def update_useradd_static_config(d):
134 break 134 break
135 135
136 # Should be an error if a specific option is set... 136 # Should be an error if a specific option is set...
137 if d.getVar('USERADD_ERROR_DYNAMIC', True) == '1' and (not uaargs.uid or not uaargs.gid): 137 if d.getVar('USERADD_ERROR_DYNAMIC', True) == '1' and not ((uaargs.uid and uaargs.uid.isdigit()) and uaargs.gid):
138 raise bb.build.FuncFailed("%s - %s: Username %s does not have a static uid/gid defined." % (d.getVar('PN', True), pkg, uaargs.LOGIN)) 138 #bb.error("Skipping recipe %s, package %s which adds username %s does not have a static uid defined." % (d.getVar('PN', True), pkg, uaargs.LOGIN))
139 raise bb.build.FuncFailed("%s - %s: Username %s does not have a static uid defined." % (d.getVar('PN', True), pkg, uaargs.LOGIN))
139 140
140 # Reconstruct the args... 141 # Reconstruct the args...
141 newparam = ['', ' --defaults'][uaargs.defaults] 142 newparam = ['', ' --defaults'][uaargs.defaults]
@@ -222,7 +223,8 @@ def update_useradd_static_config(d):
222 gaargs.gid = field[2] 223 gaargs.gid = field[2]
223 break 224 break
224 225
225 if d.getVar('USERADD_ERROR_DYNAMIC', True) == '1' and not gaargs.gid: 226 if d.getVar('USERADD_ERROR_DYNAMIC', True) == '1' and not (gaargs.gid and gaargs.gid.isdigit()):
227 #bb.error("Skipping recipe %s, package %s which adds groupname %s does not have a static gid defined." % (d.getVar('PN', True), pkg, gaargs.GROUP))
226 raise bb.build.FuncFailed("%s - %s: Groupname %s does not have a static gid defined." % (d.getVar('PN', True), pkg, gaargs.GROUP)) 228 raise bb.build.FuncFailed("%s - %s: Groupname %s does not have a static gid defined." % (d.getVar('PN', True), pkg, gaargs.GROUP))
227 229
228 # Reconstruct the args... 230 # Reconstruct the args...