The changes to rc.d/network1 will not get merged in by
mergemaster if it does not appear in the list of files to install.
This commit is contained in:
parent
034b3d7a6f
commit
23cecb19f0
@ -9,7 +9,7 @@ FILES= DAEMON LOGIN NETWORKING SERVERS abi accounting addswap adjkerntz amd \
|
||||
hostname inetd initdiskless initrandom ip6fw ipfilter ipfw ipmon ipnat \
|
||||
ipsec ipxrouted isdnd jail kadmind kerberos keyserv kldxref ldconfig \
|
||||
local localdaemons lomac lpd motd mountcritlocal mountcritremote \
|
||||
mountd moused mroute6d mrouted msgs named netif network2 network3 \
|
||||
mountd moused mroute6d mrouted msgs named netif network1 network2 network3 \
|
||||
network_ipv6 nfsclient nfsd nfslocking nfsserver nisdomain ntpd \
|
||||
ntpdate othermta pccard pcvt ppp-user pppoed pwcheck quota random \
|
||||
rarpd rcconf.sh root route6d routed rpcbind rtadvd rwho savecore \
|
||||
|
Loading…
Reference in New Issue
Block a user