diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2019-01-21 19:04:37 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2019-01-21 19:04:37 +0000 |
| commit | 9b6591109e8e14c7dfaca98bea58069429f890f8 (patch) | |
| tree | f7a62352ffdf9520f4a7691022782df65fadf3ae | |
| parent | 2a857082dc7d692897cadd6a003518db24e98308 (diff) | |
| download | src-9b6591109e8.tar.gz src-9b6591109e8.zip | |
freebsd-update: Update /etc/passwd after password db changes
Add -p to pwd_mkdb in order to ensure password db changes are also
included in /etc/passwd.
PR: 165954, 232921, 229487
Submitted by: Gerald Aryeetey <aryeeteygerald_rogers.com>
Reviewed by: jilles
MFC after: 1 month
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D18827
Notes
Notes:
svn path=/head/; revision=343270
| -rw-r--r-- | usr.sbin/freebsd-update/freebsd-update.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 3b7f6ec243e2..0935fef6aaa7 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -2918,10 +2918,11 @@ Kernel updates have been installed. Please reboot and run install_from_index INDEX-NEW || return 1 install_delete INDEX-OLD INDEX-NEW || return 1 - # Rebuild /etc/spwd.db and /etc/pwd.db if necessary. + # Rebuild generated pwd files. if [ ${BASEDIR}/etc/master.passwd -nt ${BASEDIR}/etc/spwd.db ] || - [ ${BASEDIR}/etc/master.passwd -nt ${BASEDIR}/etc/pwd.db ]; then - pwd_mkdb -d ${BASEDIR}/etc ${BASEDIR}/etc/master.passwd + [ ${BASEDIR}/etc/master.passwd -nt ${BASEDIR}/etc/pwd.db ] || + [ ${BASEDIR}/etc/master.passwd -nt ${BASEDIR}/etc/passwd ]; then + pwd_mkdb -d ${BASEDIR}/etc -p ${BASEDIR}/etc/master.passwd fi # Rebuild /etc/login.conf.db if necessary. |