cube: rename cube-domE to cube-desktop

The cube-domE name is confusing, and we constantly have to explain what
the "E" stands for.

Also, as the design progressed, domE is not an essential part of the
system .. it is optional. As such, it shouldn't be designated as a
"domain".

By dropping the domE and making it cube-desktop, we resolve both the
confusion and the inconsistency.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

README.install

@@ -9,12 +9,12 @@ functionality. The current cubes are:
          by non admin users.
  - dom1: provides system services (such as ntpd, etc) to the platform. This
          is not used by a typical user.
- - domE: provides full 'enterprise' functionality. This includes man pages,
+ - cube-desktop: provides full 'enterprise' functionality. This includes man pages,
          development tools, graphical desktop, etc. This domain is the primary
          environment for most users.
 
  - cube-server: provides a full featured, headless server environment. This is
-                similar to domE, without graphics.
+                similar to cube-desktop, without graphics.
 
 OverC also has two essential image types, that provide a foundation for the
 container runtimes. These are:
@@ -45,7 +45,7 @@ Modify local.conf with following settings:
 Clone the layers described in the meta-overc/README, and build the images
 mentioned in the overview:
 
-  % bitbake cube-dom0 cube-dom1 cube-domE cube-essential cube-builder
+  % bitbake cube-dom0 cube-dom1 cube-desktop cube-essential cube-builder
 
 This will take some time, since multiple images and configurations are
 being build and assembled.
@@ -61,7 +61,7 @@ OverC installer
 The OverC installer must be assembled from build artifacts, and provides a 
 bootable USB stick that is capable of installing to a hard disk on the 
 target system. It also completes required installation and configuration of
-the components that make up the core system (dom0, dom1, domE, essential).
+the components that make up the core system (dom0, dom1, cube-desktop, essential).
 
 The OverC installer is available from the following repository:
 
@@ -126,7 +126,7 @@ that is to be installed. This is typically:
  HDINSTALL_ROOTFS="${ARTIFACTS_DIR}/cube-essential-genericx86-64.tar.bz2"
 
  HDINSTALL_CONTAINERS="${ARTIFACTS_DIR}/cube-dom0-genericx86-64.tar.bz2 \
-                       ${ARTIFACTS_DIR}/cube-domE-genericx86-64.tar.bz2"
+                       ${ARTIFACTS_DIR}/cube-desktop-genericx86-64.tar.bz2"
 
 At this point we have the payload to create a bootable USB disk prepared. The
 scripts (or applications) that perform the final install to the target device

README.lxc

@@ -0,0 +1,13 @@
+# In the domain that you'd like to create a lxc container, run the following.
+# Note: we use --no-validate, since pgp is not currently available
+
+% lxc-create -t download -n <name> -- --no-validate
+
+# configure as required via:
+
+% lxc-attach -n <name>
+
+# to get the proper networking configuration, add the following to
+# /var/lib/lxc/<name>/config
+lxc.network.type = veth
+lxc.network.link = br-ext

README.runtime

@@ -3,7 +3,7 @@ OverC runtime
 
 Depending on the selected cubes, the user/application developer runtime varies.
 
-Generally speaking, if either domE or cube-server have been selected the user
+Generally speaking, if either cube-desktop or cube-server have been selected the user
 is presented with a enterprise-like, fully featured runtime that is suitable
 for development or application deployment.
 
@@ -41,9 +41,9 @@ Console access is available through several mechanisms:
 
        HDINSTALL_CONTAINERS="${ARTIFACTS_DIR}/cube-dom0-genericx86-64.tar.bz2:vty=2 \
 			     ${ARTIFACTS_DIR}/cube-server-genericx86-64.tar.bz2:vty=3 \
-			     ${ARTIFACTS_DIR}/cube-domE-genericx86-64.tar.bz2:vty=4"
+			     ${ARTIFACTS_DIR}/cube-desktop-genericx86-64.tar.bz2:vty=4"
 
-       Once booted, this system would have dom0 on VT2, cube-server on VT3 and domE
+       Once booted, this system would have dom0 on VT2, cube-server on VT3 and cube-desktop
        on VT4.
 
  - inter-cube pipes: For situations where a network is not available, and physical
@@ -68,9 +68,9 @@ access examples:
 
 ssh:
 
- # domE terminal:
+ # cube-desktop terminal:
  % uname -a | cut -d' ' -f2
-cube-01-12-15-domE
+cube-01-12-15-cube-desktop
 
  # connect to dom0
  % ssh root@cube-01-12-15-dom0.local
@@ -89,12 +89,12 @@ inter-container pipes:
  # find the valid console tarets:
  % cube-ctl list
 
- # domE -> dom0
+ # cube-desktop -> dom0
  % cube-console dom0
 
 <login with dom0 credentials>
 
- # domE -> cube-server, fails with an [ERROR] message, since cube-server is
+ # cube-desktop -> cube-server, fails with an [ERROR] message, since cube-server is
  # not a valid inter-container target
  % cube-console cube-server
 ERROR: cube is not allowed direct console access. log into dom0 first.

meta-cube/recipes-support/cube-cmd-server/files/cube-cmd-server.conf

@@ -26,14 +26,14 @@ commands:
   reboot:
     acl:
       - dom0
-      - domE
+      - cube-desktop
       - cube-server
     action: reboot
 
   shutdown:
     acl:
       - dom0
-      - domE
+      - cube-desktop
       - cube-server
     action: shutdown
 

meta-cube/recipes-support/overc-conftools/source/manifests/site.pp

@@ -1,6 +1,6 @@
 # Configuration data. See overc-conftools package for details.
 # Note many of these are set by the installer.
-$network_prime_container = "domE"
+$network_prime_container = "cube-server"
 $network_prime_device = "enp0s3"
 
 # network_prime_container will have an offset of 1

meta-cube/recipes-support/overc-system-agent/files/overc-system-agent-1.2/container-scripts/dom0

@@ -8,7 +8,7 @@ IMAGE_DIR=/root/images
 UPSTREAM_URL=http://openlinux.windriver.com/overc/images/genericx86-64/
 DOM0_IMAGE=cube-dom0-genericx86-64.tar.bz2
 DOM1_IMAGE=cube-dom1-genericx86-64.tar.bz2
-DOME_IMAGE=cube-domE-genericx86-64.tar.bz2
+DOME_IMAGE=cube-desktop-genericx86-64.tar.bz2
 
 usage() {
 	cat <<EOT;
@@ -61,7 +61,7 @@ EOT
 # demoService (lxc) - STOPPED
 # dom0 (lxc) - Container that I'm in
 # dom1 (lxc) (/) - RUNNING
-# domE (lxc) (/) - RUNNING
+# cube-desktop (lxc) (/) - RUNNING
 # s1 (lxc) - STOPPED
 #
 #     return value:
@@ -116,7 +116,7 @@ activate() {
 		dom1)
 			rootfs=$IMAGE_DIR/$DOM1_IMAGE
 			;;
-		domE)
+		*desktop)
 			rootfs=$IMAGE_DIR/$DOME_IMAGE
 			;;
 		*)

meta-cube/recipes-support/overc-system-agent/files/overc-system-agent-1.2/test/test.sh

@@ -7,7 +7,7 @@ SVR_PORT=12345
 OVERC_DOM0=/etc/overc/container/dom0
 
 # test url for send_image
-url=http://openlinux.windriver.com/overc/images/genericx86-64/cube-domE-genericx86-64.tar.bz2
+url=http://openlinux.windriver.com/overc/images/genericx86-64/cube-desktop-genericx86-64.tar.bz2
 
 count_snapshots() {
 	local container=$1
@@ -47,18 +47,18 @@ echo "REST server started at pid: $svr_pid"
 
 #################################################
 # test status
-# on bootup, dom0, dom1 and domE containers should be active
+# on bootup, dom0, dom1 and cube-desktop containers should be active
 #################################################
 test_container_status dom0 3
 test_container_status dom1 3
-test_container_status domE 3
+test_container_status cube-desktop 3
 test_container_status invalid_container 0
 
 #################################################
 # test start/stop
 #################################################
 echo "Test: Trying to start a container that's already active"
-$OVERC container start domE dom0
+$OVERC container start cube-desktop dom0
 status=$?
 if [ $status -ne 1 ]; then
 	echo "Error! Starting an active container should fail"
@@ -68,7 +68,7 @@ else
 	echo "OK: failed"
 fi
 echo "Test: Trying to stop a container that's active"
-$OVERC container stop domE dom0
+$OVERC container stop cube-desktop dom0
 status=$?
 if [ $status -ne 0 ]; then
 	echo "Error! Stopping an active container should succeed"
@@ -78,7 +78,7 @@ else
 	echo "OK: succeeded"
 fi
 echo "Test: Trying to start a container that's inactive"
-$OVERC container start domE dom0
+$OVERC container start cube-desktop dom0
 status=$?
 if [ $status -ne 0 ]; then
 	echo "Error! Starting an inactive container should succeed"
@@ -115,16 +115,16 @@ else
 fi
 
 #################################################
-# test activate rollback on domE
+# test activate rollback on cube-desktop
 #################################################
 echo "Test: Setting up file marker before activate/rollback test"
-touch /essential/var/lib/lxc/domE/rootfs/root/test
+touch /essential/var/lib/lxc/cube-desktop/rootfs/root/test
 
-count_snapshots domE
+count_snapshots cube-desktop
 orig_num_snapshot=$?
 
 echo "Test: activate container"
-$OVERC container activate domE dom0 -f
+$OVERC container activate cube-desktop dom0 -f
 status=$?
 if [ $status -ne 0 ]; then
 	echo "Error! Failed to activate container"
@@ -135,16 +135,16 @@ else
 fi
 
 echo "Test: Looking for file marker after activate"
-if [ -e /essential/var/lib/lxc/domE/rootfs/root/test ]; then
-	echo "Error! File /essential/var/lib/lxc/domE/rootfs/root/test should not exist!"
+if [ -e /essential/var/lib/lxc/cube-desktop/rootfs/root/test ]; then
+	echo "Error! File /essential/var/lib/lxc/cube-desktop/rootfs/root/test should not exist!"
 	exit 1
 else
 	echo "OK: file marker doesn't exist"
 fi
 
 echo "Test: counting snapshots after activate"
 expected_num_snapshot=$(expr $orig_num_snapshot + 1)
-count_snapshots domE
+count_snapshots cube-desktop
 num_snapshot=$?
 if [ $num_snapshot -ne $expected_num_snapshot ]; then
 	echo "Error! Number of snapshots should be $expected_num_snapshot [got $num_snapshot]"
@@ -154,7 +154,7 @@ else
 fi
 
 echo "Test: container should be active after active, stopping container"
-$OVERC container stop domE dom0
+$OVERC container stop cube-desktop dom0
 status=$?
 if [ $status -ne 0 ]; then
 	echo "Error! Stopping an active container should succeed"
@@ -165,7 +165,7 @@ else
 fi
 
 echo "Test: rollback container"
-$OVERC container rollback domE  dom0
+$OVERC container rollback cube-desktop  dom0
 status=$?
 if [ $status -ne 0 ]; then
 	echo "Error! Failed to perform container rollback"
@@ -176,7 +176,7 @@ else
 fi
 
 echo "Test: counting snapshots after rollback"
-count_snapshots domE
+count_snapshots cube-desktop
 num_snapshot=$?
 if [ $num_snapshot -ne $orig_num_snapshot ]; then
 	echo "Error! Number of snapshots should be $orig_num_snapshot [got $num_snapshot]"
@@ -185,7 +185,7 @@ else
 	echo "OK: $num_snapshot snapshot"
 fi
 
-$OVERC container start domE dom0
+$OVERC container start cube-desktop dom0
 status=$?
 if [ $status -ne 0 ]; then
 	echo "Error! Starting an inactive container should succeed"
@@ -194,13 +194,13 @@ if [ $status -ne 0 ]; then
 fi
 
 echo "Test: Looking for file marker after rollback"
-if [ ! -e /essential/var/lib/lxc/domE/rootfs/root/test ]; then
-	echo "Error! File /essential/var/lib/lxc/domE/rootfs/root/test should exist!"
+if [ ! -e /essential/var/lib/lxc/cube-desktop/rootfs/root/test ]; then
+	echo "Error! File /essential/var/lib/lxc/cube-desktop/rootfs/root/test should exist!"
 	exit 1
 else
 	echo "OK: file marker found"
 fi
-rm /essential/var/lib/lxc/domE/rootfs/root/test
+rm /essential/var/lib/lxc/cube-desktop/rootfs/root/test
 #
 #################################################
 # test operations on dom0