diff options
| author | Aaron LI <aly@aaronly.me> | 2019-01-06 13:48:43 +0800 |
|---|---|---|
| committer | Aaron LI <aly@aaronly.me> | 2019-01-08 19:18:28 +0800 |
| commit | 63ed60b1d125025f39a1a5209d7e537fa69c2043 (patch) | |
| tree | 0dc3cbec0c4bb3b3ea6e6efc4b9d035a5ba917aa | |
| parent | fdb1405121b2c40fff3f7277586ede1900c9cebc (diff) | |
| download | dfly-update-63ed60b1d125025f39a1a5209d7e537fa69c2043.tar.bz2 | |
Ignore several more files
Credit: https://github.com/openbsd/src/blob/master/usr.sbin/sysmerge/sysmerge.sh
| -rwxr-xr-x | dfly-update | 3 | ||||
| -rw-r--r-- | dfly-update.conf | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/dfly-update b/dfly-update index 3bf5b2d..f6ac8ea 100755 --- a/dfly-update +++ b/dfly-update @@ -83,10 +83,13 @@ FILES_IGNORE=' /etc/localtime /etc/login.conf.db /etc/master.passwd + /etc/motd /etc/passwd /etc/pwd.db /etc/rc.conf /etc/spwd.db + /var/db/locate.database + /var/mail/root ' # Filename suffix for newly installed files that need (manual) merge. NEW_SUF="__new__" diff --git a/dfly-update.conf b/dfly-update.conf index ac8521a..789d945 100644 --- a/dfly-update.conf +++ b/dfly-update.conf @@ -26,10 +26,13 @@ # /etc/localtime # /etc/login.conf.db # /etc/master.passwd +# /etc/motd # /etc/passwd # /etc/pwd.db # /etc/rc.conf # /etc/spwd.db +# /var/db/locate.database +# /var/mail/root #' # Filename suffix for newly installed config files that need (manual) |