svn commit: r287843 - head/usr.sbin/bsdinstall/scripts

[Allan Jude]

Author: allanjude
Date: Wed Sep 16 03:32:27 2015
New Revision: 287843
URL: https://svnweb.freebsd.org/changeset/base/287843

Log:
  Add a number of models to the bsdinstall GPT hack blacklist
  
  PR:		194359
  Approved by:	bapt (mentor)
  MFC after:	2 weeks
  Sponsored by:	ScaleEngine Inc.
  Differential Revision:	https://reviews.freebsd.org/D3525

Modified:
  head/usr.sbin/bsdinstall/scripts/auto

Modified: head/usr.sbin/bsdinstall/scripts/auto
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/auto	Wed Sep 16 03:03:19 2015	(r287842)
+++ head/usr.sbin/bsdinstall/scripts/auto	Wed Sep 16 03:32:27 2015	(r287843)
@@ -201,6 +201,19 @@ if f_interactive; then
 			;;
 		esac
 		;;
+	"Hewlett-Packard")
+		case "$sys_model" in
+		"HP ProBook 4330s")
+			dialog_workaround "$msg_gpt_active_fix"
+			retval=$?
+			f_dprintf "gpt_active_fix_prompt=[%s]" "$retval"
+			if [ $retval -eq $DIALOG_OK ]; then
+				export ZFSBOOT_PARTITION_SCHEME="GPT + Active"
+				export WORKAROUND_GPTACTIVE=1
+			fi
+			;;
+		esac
+		;;
 	esac
 	#
 	# Motherboard Models
@@ -208,7 +221,20 @@ if f_interactive; then
 	case "$sys_mb_maker" in
 	"Intel Corporation")
 		case "$sys_mb_product" in
-		"DP965LT")
+		"DP965LT"|"D510MO")
+			dialog_workaround "$msg_gpt_active_fix"
+			retval=$?
+			f_dprintf "gpt_active_fix_prompt=[%s]" "$retval"
+			if [ $retval -eq $DIALOG_OK ]; then
+				export ZFSBOOT_PARTITION_SCHEME="GPT + Active"
+				export WORKAROUND_GPTACTIVE=1
+			fi
+			;;
+		esac
+		;;
+	"Acer")
+		case "$sys_mb_product" in
+		"Veriton M6630G")
 			dialog_workaround "$msg_gpt_active_fix"
 			retval=$?
 			f_dprintf "gpt_active_fix_prompt=[%s]" "$retval"