Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:pcbsd/pcbsd

  • Loading branch information...
commit 362a0b65423719ed65500f1f0e86b5c4fe65c501 2 parents 8f0462a + 9f211e3
@beanpole135 beanpole135 authored
View
8 build-files/conf/port-make.conf
@@ -93,7 +93,13 @@ cups-base_UNSET=GHOSTSCRIPT
php5_SET=APACHE
virtualbox_SET=VNC WEBSERVICE
-nginx_SET=HTTP_FLV
+
+# Options requested by FreeNAS
+nginx_SET=HTTP_FLV HTTP_SSL PASSENGER
+redmine_SET=POSTGRESQL PASSENGER
+rubygem-passenger=NGINX
+rubygem-rails=FCGI PASSENGER
+rubygem-activerecord=PGSQL SQLITE3
# Configuration for www/bigbluebutton
.if ${.CURDIR:M${PORTSDIR}/www/tomcat6} != ""
View
9 overlays/install-overlay/etc/pcbsd-video.sh
@@ -41,6 +41,8 @@ if [ -n "$card2" ] ; then
sleep 1
fi
+loadIntelKMS=no
+
# Check for optimus with intel as first card
echo "$card1" | grep -q -i -e "intel"
if [ $? -eq 0 ] ; then
@@ -49,6 +51,7 @@ if [ $? -eq 0 ] ; then
echo "Detected Optimus! Using intel video..."
sleep 1
fi
+ loadIntelKMS=yes
fi
# Check for optimus with nvidia as first card
@@ -58,9 +61,15 @@ if [ $? -eq 0 ] ; then
if [ $? -eq 0 ] ; then
echo "Detected Optimus! Using intel video..."
sleep 1
+ loadIntelKMS=yes
else
echo "Detected NVIDIA! Loading NVIDIA driver..."
kldload nvidia
sleep 1
fi
fi
+
+# If we are running an intel chipset, load the newer KMS driver automatically
+if [ "$loadIntelKMS" = "yes" ] ; then
+ kldload i915kms
+fi
Please sign in to comment.
Something went wrong with that request. Please try again.