From 954b7a44bac631b93c0a95cebdfd82f8cc2e52e6 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sat, 20 Dec 2014 12:44:33 +0100 Subject: [PATCH] Revert "rc: yield to evil twin if installed in /usr/local/etc" This reverts commit 27d9f2d53d06273d9766b09200ba155dffd6ccf4. Want to do this via core package install instead. Makes it possible to deploy on a vanilla FreeBSD. --- etc/rc | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/etc/rc b/etc/rc index 1dd8d6a2006..21efc18c8a7 100644 --- a/etc/rc +++ b/etc/rc @@ -33,17 +33,6 @@ # Output and error are redirected to console by init, # and the console is the controlling terminal. -if [ -f /usr/local/etc/rc ]; then - # Basically, we yield the system to our evil twin - # when installed via a package. Not the most modern - # way in any sense, but it keeps our evil twin from - # meddling with the original system files so that we - # can purge that son-of-a-gun back into the dephts - # of hell if need be. Awwww, yes, yielding... - /usr/local/etc/rc - exit 0; -fi - # Note that almost all of the user-configurable behavior is no longer in # this file, but rather in /etc/defaults/rc.conf. Please check that file # first before contemplating any changes here. If you do need to change