[PC-BSD Commits] r4815 - in pcbsd/trunk: installcd-overlay/boot system-overlay/boot

[svn at pcbsd.org]

Author: kris
Date: 2009-10-29 12:50:09 -0700 (Thu, 29 Oct 2009)
New Revision: 4815

Modified:
   pcbsd/trunk/installcd-overlay/boot/loader.conf
   pcbsd/trunk/system-overlay/boot/loader.conf
Log:

Cleanup loader.conf to use new kernel config and be consistent



Modified: pcbsd/trunk/installcd-overlay/boot/loader.conf
===================================================================
--- pcbsd/trunk/installcd-overlay/boot/loader.conf	2009-10-29 19:46:13 UTC (rev 4814)
+++ pcbsd/trunk/installcd-overlay/boot/loader.conf	2009-10-29 19:50:09 UTC (rev 4815)
@@ -48,6 +48,3 @@
 udf_load="YES"
 udf_iconv_load="YES"
 zfs_load="YES"
-
-# Enable atapicam support
-atapicam_load="YES"

Modified: pcbsd/trunk/system-overlay/boot/loader.conf
===================================================================
--- pcbsd/trunk/system-overlay/boot/loader.conf	2009-10-29 19:46:13 UTC (rev 4814)
+++ pcbsd/trunk/system-overlay/boot/loader.conf	2009-10-29 19:50:09 UTC (rev 4815)
@@ -2,10 +2,6 @@
 kern.ipc.shmseg=1024
 kern.ipc.shmmni=1024
 
-# Load the firewall
-pf_load="YES"
-pflog_load="YES"
-
 # Enable the splash screen
 vesa_load="YES"
 splash_pcx_load="YES"
@@ -48,6 +44,3 @@
 udf_load="YES"
 udf_iconv_load="YES"
 zfs_load="YES"
-
-# Enable atapicam support
-atapicam_load="YES"