Mercurial Mercurial > upstream > oracle > slim_source / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
5208 LICENSE file needs a corset to fit on the CD. Move to /etc for fitting. Build101aRC2
authorSanjay Nadkarni <nadkarni@sun.com>
Tue, 18 Nov 2008 23:41:08 -0700
changeset 359 a2f4fcfd2a1a
parent 358 1889d1188f58
child 360 961ffa027dcd
5208 LICENSE file needs a corset to fit on the CD. Move to /etc for fitting.
usr/src/cmd/distro_const/auto_install/ai_x86_image.xml file | annotate | diff | comparison | revisions
usr/src/cmd/distro_const/slim_cd/all_lang_slim_cd.xml file | annotate | diff | comparison | revisions
usr/src/cmd/distro_const/slim_cd/slim_cd.xml file | annotate | diff | comparison | revisions
usr/src/cmd/slim-install/license/show-license file | annotate | diff | comparison | revisions 
--- a/usr/src/cmd/distro_const/auto_install/ai_x86_image.xml	Mon Nov 17 11:06:31 2008 -0700
+++ b/usr/src/cmd/distro_const/auto_install/ai_x86_image.xml	Tue Nov 18 23:41:08 2008 -0700
@@ -535,6 +535,7 @@
 			<base_exclude type="dir">etc/gconf</base_exclude>
 			<base_exclude type="dir">etc/brltty</base_exclude>
 			<base_exclude type="dir">etc/gtk-2.0</base_exclude>
+			<base_exclude type="dir">etc/notices</base_exclude>
 		</bootroot_contents>
 		<!-- If/how to compress the live image.
 		     type = compression algorith to use for pkg.zlib and misc.zlib.
--- a/usr/src/cmd/distro_const/slim_cd/all_lang_slim_cd.xml	Mon Nov 17 11:06:31 2008 -0700
+++ b/usr/src/cmd/distro_const/slim_cd/all_lang_slim_cd.xml	Tue Nov 18 23:41:08 2008 -0700
@@ -209,6 +209,7 @@
 			<base_exclude type="dir">etc/gconf</base_exclude>
 			<base_exclude type="dir">etc/brltty</base_exclude>
 			<base_exclude type="dir">etc/gtk-2.0</base_exclude>
+			<base_exclude type="dir">etc/notices</base_exclude>
 		</bootroot_contents>
 		<!-- If/how to compress the live image.
 			type = compression algorith to use for pkg.zlib and misc.xlib.
--- a/usr/src/cmd/distro_const/slim_cd/slim_cd.xml	Mon Nov 17 11:06:31 2008 -0700
+++ b/usr/src/cmd/distro_const/slim_cd/slim_cd.xml	Tue Nov 18 23:41:08 2008 -0700
@@ -208,6 +208,7 @@
 			<base_exclude type="dir">etc/gconf</base_exclude>
 			<base_exclude type="dir">etc/brltty</base_exclude>
 			<base_exclude type="dir">etc/gtk-2.0</base_exclude>
+			<base_exclude type="dir">etc/notices</base_exclude>
 		</bootroot_contents>
 		<!-- If/how to compress the live image.
 			type = compression algorith to use for pkg.zlib and misc.xlib.
--- a/usr/src/cmd/slim-install/license/show-license	Mon Nov 17 11:06:31 2008 -0700
+++ b/usr/src/cmd/slim-install/license/show-license	Tue Nov 18 23:41:08 2008 -0700
@@ -23,10 +23,9 @@
 # Use is subject to license terms.
 #
 #
-# 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
+# License file is located in the directory /etc/notices
+
+license=/etc/notices/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.
upstream/oracle/slim_source