Merge branch 'common-splitconfig' into release-2.4 (GH-77)

  Configuration files are split into "bumblebee.conf" and "optirun.conf".
Next step is to copy this two files into "/usr/share/bumblebee/" (variable
DATADIR) to keep them as safe defaults.

install-files/bumblebee.conf

@@ -35,18 +35,3 @@ BUMBLEBEE_GROUP=bumblebee
 # You should also set STOP_SERVICE_ON_EXIT to Y if you really want to save
 # power/battery life.
 ENABLE_POWER_MANAGEMENT=N
-
-
-### The below only affects optirun, restarting the daemon is not necessary ###
-
-# Image transport from bumblebee X server to screen.
-# Possible values: proxy, jpeg, rgb, xv or yuv (default = proxy)
-VGL_COMPRESS=proxy
-
-# If ECO mode is active, the nvidia card will not be used if not plugged in
-# (running on battery). This setting has only effect on newly started programs.
-ECO_MODE=N
-
-# Fall back on using the Intel graphics card if the nVidia one is not available.
-# If disabled, optirun will quit after displaying an error message.
-FALLBACK_START=N

install-files/common-functions

@@ -303,8 +303,9 @@ set_graphics_driver() {
 }
 
 # Load the settings and sets some other variables.
-# In the future, $BUMBLEBEE_CONFDIR/bumblebee.conf would be the default file
-# and users should overwrite with a custom bumblebee.conf in ~/.bumblebee.
+# In the future, $BUMBLEBEE_CONFDIR/{bumblebee,optirun}.conf would be the
+# default file and users should overwrite with a custom optirun.conf in
+# ~/.bumblebee.
 load_settings() {
     # defaults
     STOP_SERVICE_ON_EXIT=N
@@ -317,6 +318,7 @@ load_settings() {
     BUMBLEBEE_GROUP=bumblebee
     BUMBLEBEE_LOGFILE=/var/log/bumblebee.log
     . "$BUMBLEBEE_CONFDIR/bumblebee.conf"
+    . "$BUMBLEBEE_CONFDIR/optirun.conf"
 
     # Allow the user to specify a custom xorg path, otherwise base on driver
     [ -z "$X_CONFFILE" ] && X_CONFFILE="$BUMBLEBEE_CONFDIR/xorg.conf.${DRIVER}"

install-files/optirun.conf

@@ -0,0 +1,13 @@
+### The below only affects optirun, restarting the daemon is not necessary ###
+
+# Image transport from bumblebee X server to screen.
+# Possible values: proxy, jpeg, rgb, xv or yuv (default = proxy)
+VGL_COMPRESS=proxy
+
+# If ECO mode is active, the nvidia card will not be used if not plugged in
+# (running on battery). This setting has only effect on newly started programs.
+ECO_MODE=N
+
+# Fall back on using the Intel graphics card if the nVidia one is not available.
+# If disabled, optirun will quit after displaying an error message.
+FALLBACK_START=N

stages/copyfiles

@@ -4,6 +4,7 @@
 
 install_dir 755 "$CONFDIR"
 install_file 644 bumblebee.conf "$CONFDIR/bumblebee.conf"
+install_file 644 optirun.conf "$CONFDIR/optirun.conf"
 for driver in "${DRIVERS[@]}"; do
     install_file 644 "xorg.conf.$driver" "$CONFDIR/xorg.conf.$driver"
 done