--- a/usr/src/cmd/slim-install/license/show-license	Wed Sep 24 12:53:55 2008 -0400
+++ b/usr/src/cmd/slim-install/license/show-license	Fri Sep 26 15:00:25 2008 -0400
@@ -22,8 +22,12 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# We run zenity this way rather than directly from the desktop file so that
-# we can pull the license text from stdin to work around a problem with
-# zenity in dealing with non-UTF-8 characters.
 #
-zenity --text-info --title="OpenSolaris License" --width 700 --height 700 </.cdrom/LICENSE
+# Locate license file; on the CD it's at /.cdrom/LICENSE, on the installed
+# system it's at /LICENSE
+license=/.cdrom/LICENSE
+[ -f /LICENSE ] && license=/LICENSE
+
+# We run zenity this way rather so that we can pull the license text from
+# stdin to work around a problem with zenity dealing with non-UTF-8 characters.
+zenity --text-info --title="OpenSolaris License" --width 700 --height 700 <${license}

--- a/usr/src/cmd/slim-install/user/jack/Makefile	Wed Sep 24 12:53:55 2008 -0400
+++ b/usr/src/cmd/slim-install/user/jack/Makefile	Fri Sep 26 15:00:25 2008 -0400
@@ -24,7 +24,7 @@
 #
 #
 
-JACKCONFIGAUTOFILESRC = license.desktop iotrace.desktop
+JACKCONFIGAUTOFILESRC = iotrace.desktop
 JACKFILESRC644 = xscreensaver install-icon.png 
 JACKFILESRC755 = Xclients local.bashrc
 JACKDESKTOPFILESRC = 	install_opensolaris.desktop ddu.desktop \

--- a/usr/src/cmd/slim-install/user/jack/license.desktop	Wed Sep 24 12:53:55 2008 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=OpenSolaris License
-Encoding=UTF-8
-Version=1.0
-Exec=/usr/sbin/show-license
-X-GNOME-Autostart-enabled=true
-
-

--- a/usr/src/pkgdefs/SUNWinstall/prototype_com	Wed Sep 24 12:53:55 2008 -0400
+++ b/usr/src/pkgdefs/SUNWinstall/prototype_com	Fri Sep 26 15:00:25 2008 -0400
@@ -89,6 +89,7 @@
 s none usr/sbin/beadm=../../sbin/beadm
 f none usr/bin/ManifestRead
 f none usr/bin/ManifestServ
+f none usr/sbin/show-license
 
 !default 0644 root sys
 #

--- a/usr/src/pkgdefs/SUNWslim-utils/prototype_com	Wed Sep 24 12:53:55 2008 -0400
+++ b/usr/src/pkgdefs/SUNWslim-utils/prototype_com	Fri Sep 26 15:00:25 2008 -0400
@@ -38,7 +38,6 @@
 d none usr/sbin 755 root bin
 f none usr/sbin/iotrace 755 root bin
 f none usr/sbin/set_lang.bash 555 root bin
-f none usr/sbin/show-license 555 root bin
 d none sbin 755 root sys
 f none sbin/listusb 555 root bin
 f none sbin/listcd 555 root bin
@@ -50,7 +49,6 @@
 f none jack/.profile=jack/local.bashrc 755 jack staff
 d none jack/.config 755 jack staff
 d none jack/.config/autostart 755 jack staff
-f none jack/.config/autostart/license.desktop 644 jack staff
 f none jack/.config/autostart/iotrace.desktop 644 jack staff
 d none jack/Desktop 755 jack staff
 f none jack/Desktop/ddu.desktop 644 jack staff