patch-queues/mq_vpanels: changeset 0:fbc79057b3aa

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Mon Sep 13 00:29:13 2010 +0100
@@ -0,0 +1,5 @@
+^\.hg
+^\.mq
+syntax: glob
+status
+guards

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/oi-branding-java-vpanels-client	Mon Sep 13 00:29:13 2010 +0100
@@ -0,0 +1,14 @@
+Rebranding of vpanels client
+
+diff --git a/usr/src/java/vpanels/client/org/opensolaris/os/vp/client/swing/resources/Resources.properties b/usr/src/java/vpanels/client/org/opensolaris/os/vp/client/swing/resources/Resources.properties
+--- a/usr/src/java/vpanels/client/org/opensolaris/os/vp/client/swing/resources/Resources.properties
++++ b/usr/src/java/vpanels/client/org/opensolaris/os/vp/client/swing/resources/Resources.properties
+@@ -51,7 +51,7 @@
+ error.details.show = Details...
+ error.details.hide = Hide details
+ 
+-cli.description = Launch Solaris system management panels.
++cli.description = Launch OpenIndiana system management panels.
+ cli.arg.address = Specify the URI identifying the management panel to display.
+ cli.arg.host = Specify an optional host to log into.  The default is the local machine.
+ cli.arg.user = Specify an optional user to log in as.  The default is the current user.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/oi-branding-java-vpanels-panels-hypervisor	Mon Sep 13 00:29:13 2010 +0100
@@ -0,0 +1,20 @@
+Rebranding of hypervisor vpanel
+
+diff --git a/usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/help/basic.html b/usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/help/basic.html
+--- a/usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/help/basic.html
++++ b/usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/help/basic.html
+@@ -47,11 +47,11 @@
+ <body class="HlpBdy">
+ 
+ <a name="basic"></a><h4>The Hypervisor Configuration: Basic Tab</h4>
+-<p>The basic tab provides a checkbox that is used to configure whether the
+-OpenSolaris OS should boot normally on hardware, or boot under the control of
++<p>The basic tab provides a checkbox that is used to configure whether
++OpenIndiana should boot normally on hardware, or boot under the control of
+ the hypervisor. </p><p>Setting the "Enable Hypervisor" checkbox to <tt>true</tt> will update the <tt>grub</tt>(5) menu listing
+ so that booting into the hypervisor is enabled. De-selecting the check box will
+-update the menu listing so that Solaris is booted on hardware.</p><p>The tab also provides a menu used to control the amount of
++update the menu listing so that OpenIndiana is booted on hardware.</p><p>The tab also provides a menu used to control the amount of
+ memory that should be reserved for domain 0. </p><p>The "Reserved Memory" menu configures the GRUB menu item so that the specified
+ amount of memory is reserved for use by domain 0. The default
+ value is the lower of 1/2 of total installed memory, or 2048 MB.</p>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/oi-branding-java-vpanels-panels-sysid	Mon Sep 13 00:29:13 2010 +0100
@@ -0,0 +1,134 @@
+Rebranding of sysid vpanel
+
+diff --git a/usr/src/java/vpanels/panels/sysid/org/opensolaris/os/vp/panels/sysid/client/swing/images/logo.png b/usr/src/java/vpanels/panels/sysid/org/opensolaris/os/vp/panels/sysid/client/swing/images/logo.png
+index 189ab630ffb8df755256cb581d725317e209922b..f954a84a968f99a3853cddbe55a93b89a1a3ea70
+GIT binary patch
+literal 6037
+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
+KzWl98;Qs;a4#_?M
+
+diff --git a/usr/src/java/vpanels/panels/sysid/org/opensolaris/os/vp/panels/sysid/client/swing/resources/Resources.properties b/usr/src/java/vpanels/panels/sysid/org/opensolaris/os/vp/panels/sysid/client/swing/resources/Resources.properties
+--- a/usr/src/java/vpanels/panels/sysid/org/opensolaris/os/vp/panels/sysid/client/swing/resources/Resources.properties
++++ b/usr/src/java/vpanels/panels/sysid/org/opensolaris/os/vp/panels/sysid/client/swing/resources/Resources.properties
+@@ -51,7 +51,7 @@
+ sysid.sysid.cancel = Abort system configuration and discard changes?
+ 
+ sysid.welcome.title = Welcome
+-sysid.welcome.text = Thanks for choosing the OpenSolaris OS!  We need a little information to get this computer ready for your use.\n\nAfter the computer has been set up the desktop will appear.  Open the "Start Here" icon on the desktop for suggestions on what to do next.
++sysid.welcome.text = Thanks for choosing OpenIndiana!  We need a little information to get this computer ready for your use.\n\nAfter the computer has been set up the desktop will appear.  Open the "Start Here" icon on the desktop for suggestions on what to do next.
+ 
+ time.settings.timezone = Time zone:
+ # Params:

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/oi-releng-disable_hypervisor	Mon Sep 13 00:29:13 2010 +0100
@@ -0,0 +1,38 @@
+Disable hypervisor module f or oi_147 since libvirt (xvm) is missing
+
+diff --git a/usr/src/cmd/applications/Makefile b/usr/src/cmd/applications/Makefile
+--- a/usr/src/cmd/applications/Makefile
++++ b/usr/src/cmd/applications/Makefile
+@@ -29,7 +29,6 @@
+ APPS=	vp-apache.desktop \
+ 	vp-coreadm.desktop \
+ 	vp-firewall.desktop \
+-	vp-hypervisor.desktop \
+ 	vp-shares.desktop \
+ 	vp-svcs.desktop \
+ 	vp-sysmon.desktop \
+diff --git a/usr/src/cmd/rad/mod/Makefile b/usr/src/cmd/rad/mod/Makefile
+--- a/usr/src/cmd/rad/mod/Makefile
++++ b/usr/src/cmd/rad/mod/Makefile
+@@ -42,7 +42,7 @@
+ 	usermgr \
+ 	zones
+ MODULE_SUBDIRS_sparc = $(MODULE_SUBDIRS)
+-MODULE_SUBDIRS_i386 = $(MODULE_SUBDIRS) hypervisor
++MODULE_SUBDIRS_i386 = $(MODULE_SUBDIRS)
+ 
+ SUBDIRS = $(PROTO_SUBDIRS) $(XPORT_SUBDIRS) $(MODULE_SUBDIRS_$(ISA))
+ 
+diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile
+--- a/usr/src/pkg/Makefile
++++ b/usr/src/pkg/Makefile
+@@ -47,8 +47,7 @@
+ MANIFEST_DOC = \
+ 	system-management-visual-panels-doc.mf
+ 
+-MANIFESTS_i386 = \
+-	system-management-visual-panels-hypervisor.mf
++MANIFESTS_i386 =
+ 
+ MANIFESTS = $(MANIFESTS_$(ISA)) \
+ 	$(MANIFEST_DOC) \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/oi-releng-force_pkgver	Mon Sep 13 00:29:13 2010 +0100
@@ -0,0 +1,14 @@
+Override pkg version passed to pkgmogrify
+
+diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile
+--- a/usr/src/pkg/Makefile
++++ b/usr/src/pkg/Makefile
+@@ -26,7 +26,7 @@
+ include $(SRC)/Makefile.env
+ 
+ PKGVERS_CMD = $(PKG) list -Hv package/pkg | $(SED) 's/^.*@\(.*\):.*/\1.1/'
+-PKGVERS = $(PKGVERS_CMD:sh)
++PKGVERS = 0.5.11,5.11-0.147.1
+ 
+ ARCH:sh=uname -p
+ ARCH64_sparc=sparcv9

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/series	Mon Sep 13 00:29:13 2010 +0100
@@ -0,0 +1,5 @@
+oi-branding-java-vpanels-client
+oi-branding-java-vpanels-panels-sysid
+oi-branding-java-vpanels-panels-hypervisor
+oi-releng-disable_hypervisor
+oi-releng-force_pkgver

author	Albert Lee <trisk@opensolaris.org>
	Mon, 13 Sep 2010 00:29:13 +0100
changeset 0	fbc79057b3aa
child 1	ee912d43ded4

.hgignore		file \| annotate \| diff \| comparison \| revisions
oi-branding-java-vpanels-client		file \| annotate \| diff \| comparison \| revisions
oi-branding-java-vpanels-panels-hypervisor		file \| annotate \| diff \| comparison \| revisions
oi-branding-java-vpanels-panels-sysid		file \| annotate \| diff \| comparison \| revisions
oi-releng-disable_hypervisor		file \| annotate \| diff \| comparison \| revisions
oi-releng-force_pkgver		file \| annotate \| diff \| comparison \| revisions
series		file \| annotate \| diff \| comparison \| revisions