2 files changed, 21 insertions, 0 deletions

diff --git a/meta/classes/extrausers.bbclass b/meta/classes/extrausers.bbclass
index 32569e97db..90811bfe2a 100644
--- a/meta/classes/extrausers.bbclass
+++ b/meta/classes/extrausers.bbclass
@@ -46,6 +46,9 @@ set_user_group () {
                         usermod)
                                 perform_usermod "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} $opts"
                                 ;;
+                        passwd-expire)
+                                perform_passwd_expire "${IMAGE_ROOTFS}" "$opts"
+                                ;;
                         groupmod)
                                 perform_groupmod "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} $opts"
                                 ;;
diff --git a/meta/classes/useradd_base.bbclass b/meta/classes/useradd_base.bbclass
index 0d0bdb80f5..7f5b9b7219 100644
--- a/meta/classes/useradd_base.bbclass
+++ b/meta/classes/useradd_base.bbclass
@@ -145,3 +145,21 @@ perform_usermod () {
         fi
         set -e
 }
+
+perform_passwd_expire () {
+        local rootdir="$1"
+        local opts="$2"
+        bbnote "${PN}: Performing equivalent of passwd --expire with [$opts]"
+        # Directly set sp_lstchg to 0 without using the passwd command: Only root can do that
+        local username=`echo "$opts" | awk '{ print $NF }'`
+        local user_exists="`grep "^$username:" $rootdir/etc/passwd || true`"
+        if test "x$user_exists" != "x"; then
+                eval flock -x $rootdir${sysconfdir} -c \"$PSEUDO sed -i \''s/^\('$username':[^:]*\):[^:]*:/\1:0:/'\' $rootdir/etc/shadow \" || true
+                local passwd_lastchanged="`grep "^$username:" $rootdir/etc/shadow | cut -d: -f3`"
+                if test "x$passwd_lastchanged" != "x0"; then
+                        bbfatal "${PN}: passwd --expire operation did not succeed."
+                fi
+        else
+                bbnote "${PN}: user $username doesn't exist, not expiring its password"
+        fi
+}