diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/useradd-staticids.bbclass | 4 | ||||
-rw-r--r-- | meta/lib/oe/useradd.py | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass index 8e2a7fb635..3acf59cd46 100644 --- a/meta/classes/useradd-staticids.bbclass +++ b/meta/classes/useradd-staticids.bbclass | |||
@@ -174,8 +174,6 @@ def update_useradd_static_config(d): | |||
174 | newparam += ['', ' --non-unique'][uaargs.non_unique] | 174 | newparam += ['', ' --non-unique'][uaargs.non_unique] |
175 | if uaargs.password != None: | 175 | if uaargs.password != None: |
176 | newparam += ['', ' --password %s' % uaargs.password][uaargs.password != None] | 176 | newparam += ['', ' --password %s' % uaargs.password][uaargs.password != None] |
177 | elif uaargs.clear_password: | ||
178 | newparam += ['', ' --clear-password %s' % uaargs.clear_password][uaargs.clear_password != None] | ||
179 | newparam += ['', ' --root %s' % uaargs.root][uaargs.root != None] | 177 | newparam += ['', ' --root %s' % uaargs.root][uaargs.root != None] |
180 | newparam += ['', ' --system'][uaargs.system] | 178 | newparam += ['', ' --system'][uaargs.system] |
181 | newparam += ['', ' --shell %s' % uaargs.shell][uaargs.shell != None] | 179 | newparam += ['', ' --shell %s' % uaargs.shell][uaargs.shell != None] |
@@ -236,8 +234,6 @@ def update_useradd_static_config(d): | |||
236 | newparam += ['', ' --non-unique'][gaargs.non_unique] | 234 | newparam += ['', ' --non-unique'][gaargs.non_unique] |
237 | if gaargs.password != None: | 235 | if gaargs.password != None: |
238 | newparam += ['', ' --password %s' % gaargs.password][gaargs.password != None] | 236 | newparam += ['', ' --password %s' % gaargs.password][gaargs.password != None] |
239 | elif gaargs.clear_password: | ||
240 | newparam += ['', ' --clear-password %s' % gaargs.clear_password][gaargs.clear_password != None] | ||
241 | newparam += ['', ' --root %s' % gaargs.root][gaargs.root != None] | 237 | newparam += ['', ' --root %s' % gaargs.root][gaargs.root != None] |
242 | newparam += ['', ' --system'][gaargs.system] | 238 | newparam += ['', ' --system'][gaargs.system] |
243 | newparam += ' %s' % gaargs.GROUP | 239 | newparam += ' %s' % gaargs.GROUP |
diff --git a/meta/lib/oe/useradd.py b/meta/lib/oe/useradd.py index 8fc77568ff..3caa3f851a 100644 --- a/meta/lib/oe/useradd.py +++ b/meta/lib/oe/useradd.py | |||
@@ -45,7 +45,6 @@ def build_useradd_parser(): | |||
45 | parser.add_argument("-N", "--no-user-group", dest="user_group", help="do not create a group with the same name as the user", action="store_const", const=False) | 45 | parser.add_argument("-N", "--no-user-group", dest="user_group", help="do not create a group with the same name as the user", action="store_const", const=False) |
46 | parser.add_argument("-o", "--non-unique", help="allow to create users with duplicate (non-unique UID)", action="store_true") | 46 | parser.add_argument("-o", "--non-unique", help="allow to create users with duplicate (non-unique UID)", action="store_true") |
47 | parser.add_argument("-p", "--password", metavar="PASSWORD", help="encrypted password of the new account") | 47 | parser.add_argument("-p", "--password", metavar="PASSWORD", help="encrypted password of the new account") |
48 | parser.add_argument("-P", "--clear-password", metavar="CLEAR_PASSWORD", help="use this clear password for the new account") | ||
49 | parser.add_argument("-R", "--root", metavar="CHROOT_DIR", help="directory to chroot into") | 48 | parser.add_argument("-R", "--root", metavar="CHROOT_DIR", help="directory to chroot into") |
50 | parser.add_argument("-r", "--system", help="create a system account", action="store_true") | 49 | parser.add_argument("-r", "--system", help="create a system account", action="store_true") |
51 | parser.add_argument("-s", "--shell", metavar="SHELL", help="login shell of the new account") | 50 | parser.add_argument("-s", "--shell", metavar="SHELL", help="login shell of the new account") |
@@ -63,7 +62,6 @@ def build_groupadd_parser(): | |||
63 | parser.add_argument("-K", "--key", metavar="KEY=VALUE", help="override /etc/login.defs defaults") | 62 | parser.add_argument("-K", "--key", metavar="KEY=VALUE", help="override /etc/login.defs defaults") |
64 | parser.add_argument("-o", "--non-unique", help="allow to create groups with duplicate (non-unique) GID", action="store_true") | 63 | parser.add_argument("-o", "--non-unique", help="allow to create groups with duplicate (non-unique) GID", action="store_true") |
65 | parser.add_argument("-p", "--password", metavar="PASSWORD", help="use this encrypted password for the new group") | 64 | parser.add_argument("-p", "--password", metavar="PASSWORD", help="use this encrypted password for the new group") |
66 | parser.add_argument("-P", "--clear-password", metavar="CLEAR_PASSWORD", help="use this clear password for the new group") | ||
67 | parser.add_argument("-R", "--root", metavar="CHROOT_DIR", help="directory to chroot into") | 65 | parser.add_argument("-R", "--root", metavar="CHROOT_DIR", help="directory to chroot into") |
68 | parser.add_argument("-r", "--system", help="create a system account", action="store_true") | 66 | parser.add_argument("-r", "--system", help="create a system account", action="store_true") |
69 | parser.add_argument("GROUP", help="Group name of the new group") | 67 | parser.add_argument("GROUP", help="Group name of the new group") |