diff --git a/server/vglserver_config b/server/vglserver_config

index 97ed313..45347fa 100644

--- a/server/vglserver_config

+++ b/server/vglserver_config

@@ -324,11 +324,7 @@ setdripermissions()

 unconfigdev()

 {

-	if [ "$UNAME_S" = "SunOS" ]; then

-		echo ... Modifying /etc/logindevperm to enable automatic permissions for

-		echo "    /dev/fbs/* ..."

-		uncommentline /etc/logindevperm "\/dev\/console.*\/dev\/fbs"

-	elif [ "$UNAME_S" = "Linux" ]; then

+	if [ "$UNAME_S" = "Linux" ]; then

 		if [ -f /etc/security/console.perms ]; then

 			echo ... Modifying /etc/security/console.perms to enable automatic permissions

 			echo "    for DRI devices ..."

@@ -371,21 +367,7 @@ unconfigdev()

 configdev()

 {

-	if [ "$UNAME_S" = "SunOS" ]; then

-		echo ... Modifying /etc/logindevperm to disable automatic permissions for

-		echo "    /dev/fbs/* ..."

-		commentline /etc/logindevperm "\/dev\/console.*\/dev\/fbs"

-		chmod 755 /dev/fbs

-		if [ "$FBDEVVGLUSERSONLY" = "1" ]; then

-			echo ... Granting write permission to /dev/fbs/\* for vglusers group ...

-			chmod 660 /dev/fbs/*

-			chown root:vglusers /dev/fbs/*

-		else

-			echo ... Granting write permission to /dev/fbs/\* for all users ...

-			chmod 666 /dev/fbs/*

-			chown root:root /dev/fbs/*

-		fi

-	elif [ "$UNAME_S" = "Linux" ]; then

+	if [ "$UNAME_S" = "Linux" ]; then

 		if [ -f /etc/security/console.perms ]; then

 			echo ... Modifying /etc/security/console.perms to disable automatic permissions

 			echo "    for DRI devices ..."

@@ -596,22 +578,6 @@ EOF

 		removeline /etc/lightdm/lightdm.conf display-setup-script

 	fi

-	if [ "$UNAME_S" = "SunOS" ]; then

-		if [ -f /etc/dt/config/Xsetup ]; then

-			delvglgenkey /etc/dt/config/Xsetup

-		fi

-		if [ -f /etc/dt/config/Xconfig ]; then

-			echo ... Restoring default value of Dtlogin\*grabServer in ...

-			echo "...     /etc/dt/config/Xconfig ..."

-			commentline /etc/dt/config/Xconfig Dtlogin\\*grabServer

-		fi

-		if [ -f /etc/dt/config/Xconfig.SUNWut.prototype ]; then

-			echo ... Restoring default value of Dtlogin\*grabServer in ...

-			echo "...     /etc/dt/config/Xconfig.SUNWut.prototype ..."

-			commentline /etc/dt/config/Xconfig.SUNWut.prototype Dtlogin\\*grabServer

-		fi

-	fi

-

 	for file in /etc/X11/xdm/Xservers \

 		/etc/X11/gdm/gdm.conf \

 		/etc/gdm/custom.conf \

@@ -637,14 +603,6 @@ EOF

 			enablextestkdm $file

 		fi

 	done

-	if [ "$UNAME_S" = "SunOS" ]; then

-		if [ -f /etc/dt/config/Xservers ]; then

-			enablextest /etc/dt/config/Xservers

-		fi

-		if [ -x /usr/sbin/svccfg ]; then

-			/usr/sbin/svccfg -s application/x11/x11-server delpropvalue options/server_args "*-tst*" 2>&1 >/dev/null

-		fi

-	fi

 	for file in /etc/X11/gdm/gdm.conf \

 		/etc/gdm/custom.conf \

@@ -761,45 +719,6 @@ EOF

 		addvglgenkey_lightdm /etc/lightdm/lightdm.conf

 	fi

-	if [ "$UNAME_S" = "SunOS" ]; then

-		if [ ! -d /etc/dt/config ]; then

-			echo ... Creating /etc/dt/config/ directory ...

-			mkdir -p /etc/dt/config

-			chmod 755 /etc/dt/config

-		fi

-

-		if [ ! -f /etc/dt/config/Xsetup ]; then

-			if [ -f /usr/dt/config/Xsetup ]; then

-				echo ... Copying /usr/dt/config/Xsetup to /etc/dt/config/Xsetup ...

-				cp /usr/dt/config/Xsetup /etc/dt/config/Xsetup

-			fi

-		else

-			backup /etc/dt/config/Xsetup

-		fi

-		if [ -f /etc/dt/config/Xsetup ]; then

-			addvglgenkey /etc/dt/config/Xsetup bottom

-		fi

-

-		if [ ! -f /etc/dt/config/Xconfig ]; then

-			if [ -f /usr/dt/config/Xconfig ]; then

-				echo ... Copying /usr/dt/config/Xconfig to /etc/dt/config/Xconfig ...

-				cp /usr/dt/config/Xconfig /etc/dt/config/Xconfig

-			fi

-		else

-			backup /etc/dt/config/Xconfig

-		fi

-		if [ -f /etc/dt/config/Xconfig ]; then

-			echo ... Setting Dtlogin\*grabServer to False in /etc/dt/config/Xconfig ...

-			replaceline /etc/dt/config/Xconfig Dtlogin\\*grabServer "Dtlogin\*grabServer: False"

-		fi

-		if [ -f /etc/dt/config/Xconfig.SUNWut.prototype ]; then

-			backup /etc/dt/config/Xconfig.SUNWut.prototype

-			echo ... Setting Dtlogin\*grabServer to False in /etc/dt/config/Xconfig.SUNWut.prototype ...

-			replaceline /etc/dt/config/Xconfig.SUNWut.prototype Dtlogin\\*grabServer "Dtlogin\*grabServer: False"

-		fi

-

-	fi

-

 	for file in /etc/X11/xdm/Xservers \

 		/etc/X11/gdm/gdm.conf \

 		/etc/gdm/custom.conf \

@@ -837,30 +756,6 @@ EOF

 			fi

 		fi

 	done

-	if [ "$UNAME_S" = "SunOS" ]; then

-		if [ "$DISABLEXTEST" = "1" ]; then

-			if [ ! -f /etc/dt/config/Xservers ]; then

-				if [ -f /usr/dt/config/Xservers ]; then

-					echo ... Copying /usr/dt/config/Xservers to /etc/dt/config/Xservers ...

-					cp /usr/dt/config/Xservers /etc/dt/config/Xservers

-				fi

-			fi

-			if [ -f /etc/dt/config/Xservers ]; then

-				disablextest /etc/dt/config/Xservers

-			fi

-			if [ -x /usr/sbin/svccfg ]; then

-				/usr/sbin/svccfg -s application/x11/x11-server delpropvalue options/server_args "*-tst*" 2>&1 >/dev/null

-				/usr/sbin/svccfg -s application/x11/x11-server addpropvalue options/server_args -tst 2>&1 >/dev/null

-			fi

-		else

-			if [ -f /etc/dt/config/Xservers ]; then

-				enablextest /etc/dt/config/Xservers

-			fi

-			if [ -x /usr/sbin/svccfg ]; then

-				/usr/sbin/svccfg -s application/x11/x11-server delpropvalue options/server_args "*-tst*" 2>&1 >/dev/null

-			fi

-		fi

-	fi

 	if [ "$UNAME_S" = "Linux" ]; then

 		if [ -f /etc/inittab ]; then