Merge remote-tracking branch 'upstream/master'

etc/inc/config.lib.inc

@@ -495,6 +495,8 @@ function write_config($desc="Unknown", $backup = true) {
 	*/
 
 	$username = empty($_SESSION["Username"]) ? "(system)" : $_SESSION['Username'];
+	if (!empty($_SERVER['REMOTE_ADDR']))
+		$username .= '@' . $_SERVER['REMOTE_ADDR'];
 
 	if($backup)
 		backup_config();

etc/rc.php_ini_setup

@@ -166,6 +166,10 @@ html_errors = Off
 zlib.output_compression = Off
 zlib.output_compression_level = 1
 include_path = ".:/etc/inc:/usr/local/www:/usr/local/captiveportal:/usr/local/pkg"
+display_startup_errors=off
+display_errors=off
+log_errors=on
+error_log=/tmp/PHP_errors.log
 extension_dir=${EXTENSIONSDIR}
 
 ; Extensions

usr/local/sbin/ovpn-linkup

@@ -2,11 +2,17 @@
 
 # let the configuration system know that the ip has changed.
 #/usr/local/sbin/pfSctl -c "interface newip $interface"
-if [ "" != "$route_vpn_gateway" ]; then
-	/bin/echo $route_vpn_gateway > /tmp/$1_router
-else
-	/bin/echo $5 > /tmp/$1_router
+
+
+ifindex="${1##?????}"
+if [ -f /dev/tun$ifindex ]; then
+	if [ "" != "$route_vpn_gateway" ]; then
+		/bin/echo $route_vpn_gateway > /tmp/$1_router
+	else
+		/bin/echo $5 > /tmp/$1_router
+	fi
 fi
+
 /usr/bin/touch /tmp/$1up
 # reload filter 
 /usr/local/sbin/pfSctl -c "interface newip $1"

usr/sbin/pc-sysinstall/backend/functions-bsdlabel.sh

@@ -123,7 +123,7 @@ gen_glabel_name()
   # Check if we are doing /, and rename it
   if [ "$MOUNT" = "/" ]
   then
-    NAME="rootfs"
+    NAME=`cat /etc/inc/globals.inc | grep product_name | awk '{ print $3 }' | cut -d'"' -f2`
   else
     # If doing a swap partition, also rename it
     if [ "${TYPE}" = "SWAP" ]