summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2010-05-22 23:18:12 -0400
committerScott Ullrich <sullrich@pfsense.org>2010-05-22 23:18:12 -0400
commite5cd6d89607a9fada16fc483a1a55e15a4804daf (patch)
treeb6f59382757dbee8589beb575944abefc6df3e84
parent2e98ba40e0ec7e8a5e55bd9497e28e730fdc2dbc (diff)
downloadpfsense-e5cd6d89607a9fada16fc483a1a55e15a4804daf.zip
pfsense-e5cd6d89607a9fada16fc483a1a55e15a4804daf.tar.gz
Do not include altq/shaper twice
-rw-r--r--PCBSD/pc-sysinstall/changes.txt4
-rw-r--r--etc/phpshellsessions/enablesshd2
2 files changed, 3 insertions, 3 deletions
diff --git a/PCBSD/pc-sysinstall/changes.txt b/PCBSD/pc-sysinstall/changes.txt
index 031bac8..2fcca4a 100644
--- a/PCBSD/pc-sysinstall/changes.txt
+++ b/PCBSD/pc-sysinstall/changes.txt
@@ -1,3 +1,5 @@
PCBSD -> pfSense changes
-# Modified test-live to use mount | grep "/dev/iso9660/pfSense" >/dev/null 2>/dev/null
+1. Modified test-live to use mount | grep "/dev/iso9660/pfSense" >/dev/null 2>/dev/null
+2. Removed desktop specific components directory
+3. \ No newline at end of file
diff --git a/etc/phpshellsessions/enablesshd b/etc/phpshellsessions/enablesshd
index a9473b4..6e601dd 100644
--- a/etc/phpshellsessions/enablesshd
+++ b/etc/phpshellsessions/enablesshd
@@ -2,8 +2,6 @@ global $config;
echo "Starting enablesshd...";
require("config.inc");
echo ".";
-require("shaper.inc");
-echo ".";
$config = parse_config(true);
echo ".";
$config['system']['enablesshd'] = true;
OpenPOWER on IntegriCloud