diff options
| author | Eivind Eklund <eivind@FreeBSD.org> | 2003-08-14 12:46:57 +0000 |
|---|---|---|
| committer | Eivind Eklund <eivind@FreeBSD.org> | 2003-08-14 12:46:57 +0000 |
| commit | e2f5a0ddf38e268aa229b94b2e5134f0240e8911 (patch) | |
| tree | ef04dbb8f776066d92f65507badd154f7e7c9a79 /sysutils | |
| parent | 41bd72cbcb75932df370d340998336a929806a60 (diff) | |
Notes
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/etcmerge/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/etcmerge/src/etcmerge.sh | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/sysutils/etcmerge/Makefile b/sysutils/etcmerge/Makefile index 1b22484e20e5..5f8b2426781c 100644 --- a/sysutils/etcmerge/Makefile +++ b/sysutils/etcmerge/Makefile @@ -8,7 +8,7 @@ # PORTNAME= etcmerge -PORTVERSION= 0.1 +PORTVERSION= 0.2 CATEGORIES= sysutils textproc MASTER_SITES= # none DISTFILES= # none diff --git a/sysutils/etcmerge/src/etcmerge.sh b/sysutils/etcmerge/src/etcmerge.sh index d5d8d4edcbab..31ea1e5e7b7d 100644 --- a/sysutils/etcmerge/src/etcmerge.sh +++ b/sysutils/etcmerge/src/etcmerge.sh @@ -123,6 +123,14 @@ case "$1" in exit 1 fi done + # XXX Check for need? + /usr/sbin/pwd_mkdb -d etc-merged -p etc-merged/master.passwd + /usr/bin/cap_mkdb etc-merged/login.conf + if diff -q /etc/mail/aliases etc-merged/mail/aliases > /dev/null + NEED_NEWALIASES=yes + else + NEED_NEWALIASES=no + fi tmpetc=/etc.$(date +%Y%m%d) # XXX The entire set of operations below should be transactional. # This could be achieved by doing the updates as a series of @@ -146,6 +154,9 @@ case "$1" in mv /etc/ /etc.etcmergeold mv ${tmpetc} /etc fsync / + if [ "${NEED_NEWALIASES}" = "yes" ]; then + /usr/sbin/newaliases + fi mv ${REFETC} ${REFETC}.etcmergeold mv ${REFETC}.etcmerge ${REFETC} fsync /var/db |