From: Peter Avalos Date: Sun, 2 Jun 2013 08:21:46 +0000 (-0700) Subject: Stop overwriting /etc/services. X-Git-Tag: v3.7.0~1030 X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/e88b0399926ff960533ce78475e9016b647e14de Stop overwriting /etc/services. Users should be able to configure their services database, so those changes shouldn't be blown away when they do a make upgrade. Dragonfly-bug: --- diff --git a/etc/Makefile b/etc/Makefile index e6fb247820..1fc9e2d19a 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -12,7 +12,7 @@ BINUPDATE= apmd.conf fbtab gettytab network.subr \ protocols \ rc rc.firewall6 \ rc.sendmail rc.shutdown \ - rc.subr rpc services \ + rc.subr rpc \ etc.${MACHINE_ARCH}/disktab .if defined(BINARY_UPGRADE) # location of these depends on upgrade method BINUPDATE+=mail.rc locate.rc @@ -31,7 +31,7 @@ BIN1= amd.map auth.conf \ inetd.conf login.access login.conf \ motd modems netconfig networks newsyslog.conf \ nscd.conf pf.conf phones printcap profile \ - regdomain.xml remote sensorsd.conf \ + regdomain.xml remote sensorsd.conf services \ shells sysctl.conf syslog.conf usbd.conf \ etc.${MACHINE_ARCH}/ttys .if defined(BINARY_UPGRADE) # location of these depends on upgrade method