diff options
| -rw-r--r-- | meta/classes/useradd_base.bbclass | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/meta/classes/useradd_base.bbclass b/meta/classes/useradd_base.bbclass index f4dc7134cb..ba87edc57a 100644 --- a/meta/classes/useradd_base.bbclass +++ b/meta/classes/useradd_base.bbclass | |||
| @@ -51,14 +51,6 @@ perform_groupmems () { | |||
| 51 | local groupname=`echo "$opts" | awk '{ for (i = 1; i < NF; i++) if ($i == "-g" || $i == "--group") print $(i+1) }'` | 51 | local groupname=`echo "$opts" | awk '{ for (i = 1; i < NF; i++) if ($i == "-g" || $i == "--group") print $(i+1) }'` |
| 52 | local username=`echo "$opts" | awk '{ for (i = 1; i < NF; i++) if ($i == "-a" || $i == "--add") print $(i+1) }'` | 52 | local username=`echo "$opts" | awk '{ for (i = 1; i < NF; i++) if ($i == "-a" || $i == "--add") print $(i+1) }'` |
| 53 | bbnote "${PN}: Running groupmems command with group $groupname and user $username" | 53 | bbnote "${PN}: Running groupmems command with group $groupname and user $username" |
| 54 | # groupmems fails if /etc/gshadow does not exist | ||
| 55 | local gshadow="" | ||
| 56 | if [ -f $rootdir${sysconfdir}/gshadow ]; then | ||
| 57 | gshadow="yes" | ||
| 58 | else | ||
| 59 | gshadow="no" | ||
| 60 | touch $rootdir${sysconfdir}/gshadow | ||
| 61 | fi | ||
| 62 | local mem_exists="`grep "^$groupname:[^:]*:[^:]*:\([^,]*,\)*$username\(,[^,]*\)*" $rootdir/etc/group || true`" | 54 | local mem_exists="`grep "^$groupname:[^:]*:[^:]*:\([^,]*,\)*$username\(,[^,]*\)*" $rootdir/etc/group || true`" |
| 63 | if test "x$mem_exists" = "x"; then | 55 | if test "x$mem_exists" = "x"; then |
| 64 | eval flock -x $rootdir${sysconfdir} -c \"$PSEUDO groupmems \$opts\" || true | 56 | eval flock -x $rootdir${sysconfdir} -c \"$PSEUDO groupmems \$opts\" || true |
| @@ -69,10 +61,6 @@ perform_groupmems () { | |||
| 69 | else | 61 | else |
| 70 | bbnote "${PN}: group $groupname already contains $username, not re-adding it" | 62 | bbnote "${PN}: group $groupname already contains $username, not re-adding it" |
| 71 | fi | 63 | fi |
| 72 | if test "x$gshadow" = "xno"; then | ||
| 73 | rm -f $rootdir${sysconfdir}/gshadow | ||
| 74 | rm -f $rootdir${sysconfdir}/gshadow- | ||
| 75 | fi | ||
| 76 | } | 64 | } |
| 77 | 65 | ||
| 78 | perform_groupdel () { | 66 | perform_groupdel () { |
