diff options
author | jhb <jhb@FreeBSD.org> | 2014-01-22 16:59:53 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2014-01-22 16:59:53 +0000 |
commit | 08c2799ac32bcfa927afad09c3fd080204c2fca2 (patch) | |
tree | 8ef7f4c487980321f126092e56db4386567ccc57 /usr.sbin/etcupdate | |
parent | ada0e25d918f99abb6bf16ddd3802b8b28a5c935 (diff) | |
download | FreeBSD-src-08c2799ac32bcfa927afad09c3fd080204c2fca2.zip FreeBSD-src-08c2799ac32bcfa927afad09c3fd080204c2fca2.tar.gz |
Generate /var/db/services.db during 'make distribution' so that it is
present during new installs. Update etcupdate and mergemaster to
ignore the generated file.
Tested by: gjb (release build)
MFC after: 1 month
Diffstat (limited to 'usr.sbin/etcupdate')
-rwxr-xr-x | usr.sbin/etcupdate/etcupdate.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh index addcc14..a4728fa 100755 --- a/usr.sbin/etcupdate/etcupdate.sh +++ b/usr.sbin/etcupdate/etcupdate.sh @@ -213,7 +213,8 @@ build_tree() # Purge auto-generated files. Only the source files need to # be updated after which these files are regenerated. - rm -f $1/etc/*.db $1/etc/passwd >&3 2>&1 || return 1 + rm -f $1/etc/*.db $1/etc/passwd $1/var/db/services.db >&3 2>&1 || \ + return 1 # Remove empty files. These just clutter the output of 'diff'. find $1 -type f -size 0 -delete >&3 2>&1 || return 1 |