diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2014-09-19 11:16:15 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2014-09-19 11:16:15 +0000 |
| commit | f9f428a87ee39040e6fd47ea94177ed1f0425fc7 (patch) | |
| tree | c69752196b476613985859ff1c4ef2792c164e90 | |
| parent | Add missing manual pages for armv7 (omap) drivers. (diff) | |
| download | wireguard-openbsd-f9f428a87ee39040e6fd47ea94177ed1f0425fc7.tar.xz wireguard-openbsd-f9f428a87ee39040e6fd47ea94177ed1f0425fc7.zip | |
Move /etc/rc.conf from the etc to the base set.
People should not have been hand-editing /etc/rc.conf
(# DO NOT EDIT THIS FILE!!) but in the case you did, you need to merge
your changes into /etc/rc.conf.local or they will be overwritten at next
upgrade.
ok deraadt@
| -rw-r--r-- | distrib/sets/lists/base/mi | 1 | ||||
| -rw-r--r-- | distrib/sets/lists/etc/mi | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index 8c6d2a6e83c..cb14c04b9b7 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -131,6 +131,7 @@ ./etc/ppp/options.sample ./etc/protocols ./etc/rc +./etc/rc.conf ./etc/rc.d ./etc/rc.d/amd ./etc/rc.d/apmd diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi index ba88ba571a8..76a35cbf5cb 100644 --- a/distrib/sets/lists/etc/mi +++ b/distrib/sets/lists/etc/mi @@ -31,7 +31,6 @@ ./etc/ppp/options ./etc/ppp/pap-secrets ./etc/pwd.db -./etc/rc.conf ./etc/shells ./etc/skel/.Xdefaults ./etc/skel/.cshrc |