summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2015-07-01 15:01:28 -0500
committerChris Buechler <cmb@pfsense.org>2015-07-01 15:01:28 -0500
commit9924ebd4af1beaed58ba1f0d0041bf4fc22223f7 (patch)
treea1820281518400a0e8d0d35b9df550a853a7b63e /etc
parent45521d7c75d5cc5c34525e8cdfa2ad01fe897cd9 (diff)
downloadpfsense-9924ebd4af1beaed58ba1f0d0041bf4fc22223f7.zip
pfsense-9924ebd4af1beaed58ba1f0d0041bf4fc22223f7.tar.gz
Remove the unnecessary deletion of rc.conf. Add an empty rc.conf with a
note so people don't think they should be using it.
Diffstat (limited to 'etc')
-rwxr-xr-xetc/rc5
-rw-r--r--etc/rc.conf1
-rwxr-xr-xetc/rc.firmware1
3 files changed, 1 insertions, 6 deletions
diff --git a/etc/rc b/etc/rc
index 3ca50b8..4e7b368 100755
--- a/etc/rc
+++ b/etc/rc
@@ -338,11 +338,6 @@ echo -n "."
/sbin/ldconfig -elf /usr/lib /usr/local/lib /lib
/etc/rc.d/ldconfig start 2>/dev/null
-# Make sure /etc/rc.conf doesn't exist.
-if [ -f /etc/rc.conf ]; then
- /bin/rm -rf /etc/rc.conf
-fi
-
if [ ! "$PLATFORM" = "jail" ]; then
# Launching kbdmux(4)
if [ -f "/dev/kbdmux0" ]; then
diff --git a/etc/rc.conf b/etc/rc.conf
new file mode 100644
index 0000000..01cd50f
--- /dev/null
+++ b/etc/rc.conf
@@ -0,0 +1 @@
+# THIS FILE DOES NOTHING, DO NOT MAKE CONFIG CHANGES HERE
diff --git a/etc/rc.firmware b/etc/rc.firmware
index cf15f1d..d7e3009 100755
--- a/etc/rc.firmware
+++ b/etc/rc.firmware
@@ -357,7 +357,6 @@ pfSenseNanoBSDupgrade)
echo "" >> /conf/fdisk_upgrade_log.txt
# Remove extra stuff
- rm -rf /etc/rc.conf
rm -rf /etc/motd
rm -rf /usr/savecore/*
OpenPOWER on IntegriCloud