From 20dc750d6a12928a110e97fc934f65e274961385 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Wed, 18 Nov 2015 12:17:32 +0100
Subject: [PATCH] Update run scenarios for policy label matching

Issue #1766
---
 repos/base-linux/run/lx_fs.run           |  2 +-
 repos/dde_rump/run/rump_cgd_ext2.run     |  2 +-
 repos/dde_rump/run/rump_ext2.run         |  2 +-
 repos/dde_rump/run/rump_fat.run          |  2 +-
 repos/dde_rump/run/rump_iso.run          |  2 +-
 repos/gems/run/cpu_load_display.run      |  2 +-
 repos/gems/run/decorator.run             |  4 ++--
 repos/gems/run/decorator_stress.run      |  2 +-
 repos/gems/run/launcher.run              | 22 ++++++++++----------
 repos/gems/run/menu_view.run             |  4 ++--
 repos/gems/run/mixer_gui_qt_test.run     | 26 ++++++++++++------------
 repos/gems/run/nano3d.run                |  6 +++---
 repos/gems/run/nit_fader.run             |  4 ++--
 repos/gems/run/terminal_log.run          |  4 ++--
 repos/gems/run/wm.run                    |  4 ++--
 repos/libports/run/eglgears.run          |  4 ++--
 repos/libports/run/libc_ffat_fs.run      |  2 +-
 repos/libports/run/libc_fs_tar_fs.run    |  2 +-
 repos/libports/run/libc_vfs.run          |  2 +-
 repos/libports/run/libc_vfs_fs.run       |  2 +-
 repos/libports/run/qt5_common.inc        |  2 +-
 repos/os/run/clipboard.run               |  6 +++---
 repos/os/run/demo.run                    | 10 ++++-----
 repos/os/run/loader.run                  |  2 +-
 repos/os/run/vfs_stress_fs.run           |  2 +-
 repos/ports/run/debug_nitpicker.run      |  4 ++--
 repos/ports/run/noux_net_netcat.run      |  2 +-
 repos/ports/run/noux_shell_script.run    |  2 +-
 repos/ports/run/noux_terminal_fs.run     |  4 ++--
 repos/ports/run/noux_trace_fs.run        |  6 +++---
 repos/ports/run/noux_two_terminal_fs.run |  4 ++--
 repos/ports/run/seoul.inc                |  2 +-
 repos/ports/run/vbox_auto_win7_share.run |  4 ++--
 repos/ports/run/vbox_pointer.run         |  4 ++--
 repos/ports/run/vbox_win.inc             |  2 +-
 repos/ports/run/virtualbox_auto.inc      |  2 +-
 36 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/repos/base-linux/run/lx_fs.run b/repos/base-linux/run/lx_fs.run
index aee42c45c..51a5f3d55 100644
--- a/repos/base-linux/run/lx_fs.run
+++ b/repos/base-linux/run/lx_fs.run
@@ -37,7 +37,7 @@ install_config {
 	<start name="lx_fs">
 		<resource name="RAM" quantum="4M"/>
 		<provides> <service name="File_system"/> </provides>
-		<config> <policy label="" root="/libc_vfs" writeable="yes" /> </config>
+		<config> <policy label="test-libc_vfs" root="/libc_vfs" writeable="yes" /> </config>
 	</start>
 	<start name="test-libc_vfs">
 		<resource name="RAM" quantum="2M"/>
diff --git a/repos/dde_rump/run/rump_cgd_ext2.run b/repos/dde_rump/run/rump_cgd_ext2.run
index 4a011330e..5a853cd92 100644
--- a/repos/dde_rump/run/rump_cgd_ext2.run
+++ b/repos/dde_rump/run/rump_cgd_ext2.run
@@ -93,7 +93,7 @@ append config {
 		<resource name="RAM" quantum="16M"/>
 		<provides><service name="File_system"/></provides>
 		<config fs="ext2fs">
-			<policy label="" root="/" writeable="yes"/>
+			<policy root="/" writeable="yes"/>
 		</config>
 		<route>
 			<service name="Block"> <child name="rump_cgd"/> </service>
diff --git a/repos/dde_rump/run/rump_ext2.run b/repos/dde_rump/run/rump_ext2.run
index 8800307c9..1cfd36765 100644
--- a/repos/dde_rump/run/rump_ext2.run
+++ b/repos/dde_rump/run/rump_ext2.run
@@ -62,7 +62,7 @@ append config {
 	<start name="rump_fs">
 		<resource name="RAM" quantum="8M" />
 		<provides><service name="File_system"/></provides>
-		<config fs="ext2fs"><policy label="" root="/" writeable="yes"/></config>
+		<config fs="ext2fs"><policy label="test-libc_vfs" root="/" writeable="yes"/></config>
 	</start>
 	<start name="test-libc_vfs">
 		<resource name="RAM" quantum="4M"/>
diff --git a/repos/dde_rump/run/rump_fat.run b/repos/dde_rump/run/rump_fat.run
index f5ab9bb8c..9e3a53204 100644
--- a/repos/dde_rump/run/rump_fat.run
+++ b/repos/dde_rump/run/rump_fat.run
@@ -62,7 +62,7 @@ append config {
 	<start name="rump_fs">
 		<resource name="RAM" quantum="8M" />
 		<provides><service name="File_system"/></provides>
-		<config fs="msdos"><policy label="" root="/" writeable="yes"/></config>
+		<config fs="msdos"><policy root="/" writeable="yes"/></config>
 	</start>
 	<start name="test-libc_vfs">
 		<resource name="RAM" quantum="4M"/>
diff --git a/repos/dde_rump/run/rump_iso.run b/repos/dde_rump/run/rump_iso.run
index 00ddee6d4..5703ecfc3 100644
--- a/repos/dde_rump/run/rump_iso.run
+++ b/repos/dde_rump/run/rump_iso.run
@@ -56,7 +56,7 @@ append config {
 	<start name="rump_fs">
 		<resource name="RAM" quantum="8M" />
 		<provides><service name="File_system"/></provides>
-		<config fs="cd9660"><policy label="" root="/" writeable="no"/></config>
+		<config fs="cd9660"><policy label="fs_rom" root="/" writeable="no"/></config>
 	</start>
 	<start name="fs_rom">
 		<resource name="RAM" quantum="2M"/>
diff --git a/repos/gems/run/cpu_load_display.run b/repos/gems/run/cpu_load_display.run
index 50dd7a8d3..9280c5b18 100644
--- a/repos/gems/run/cpu_load_display.run
+++ b/repos/gems/run/cpu_load_display.run
@@ -110,7 +110,7 @@ append config {
 			<domain name="default" layer="2" label="no" content="client" hover="always" />
 
 			<policy label="pointer" domain="pointer"/>
-			<policy label=""        domain="default"/>
+			<policy domain="default"/>
 		</config>
 	</start>
 
diff --git a/repos/gems/run/decorator.run b/repos/gems/run/decorator.run
index 9ba60e324..30849ec58 100644
--- a/repos/gems/run/decorator.run
+++ b/repos/gems/run/decorator.run
@@ -61,8 +61,8 @@ append config {
 		<provides><service name="Nitpicker"/></provides>
 		<config>
 			<report pointer="yes" />
-			<domain name="" layer="2" content="client" label="no"/>
-			<policy label="" domain=""/>
+			<domain name="default" layer="2" content="client" label="no"/>
+			<policy domain="default"/>
 		</config>
 	</start>
 	<start name="dynamic_rom">
diff --git a/repos/gems/run/decorator_stress.run b/repos/gems/run/decorator_stress.run
index 3fe5fa48c..9fea2af2a 100644
--- a/repos/gems/run/decorator_stress.run
+++ b/repos/gems/run/decorator_stress.run
@@ -103,7 +103,7 @@ append config {
 		<provides><service name="Nitpicker"/></provides>
 		<config>
 			<domain name="" layer="2" content="client" label="no" />
-			<policy label="" domain=""/>
+			<policy domain=""/>
 			<report pointer="yes" />
 		</config>
 		<route>
diff --git a/repos/gems/run/launcher.run b/repos/gems/run/launcher.run
index b23112c16..7528e7703 100644
--- a/repos/gems/run/launcher.run
+++ b/repos/gems/run/launcher.run
@@ -79,14 +79,14 @@ append config {
 			<report hover="yes" focus="yes" />
 			<domain name="pointer"   layer="1" content="client" label="no" origin="pointer" />
 			<domain name="panel"     layer="2" content="client" label="no" hover="always" focus="transient" />
-			<domain name=""          layer="3" color="#ff0000" hover="always" focus="click" />
+			<domain name="default"   layer="3" color="#ff0000" hover="always" focus="click" />
 			<domain name="decorator" layer="3" content="client" label="no" hover="always" focus="transient" />
 
-			<policy label="pointer"                domain="pointer"/>
-			<policy label="wm -> launcher -> menu" domain="panel"/>
-			<policy label=""                       domain=""/>
-			<policy label="wm -> decorator"        domain="decorator"/>
-			<policy label="status_bar"             domain="panel"/>
+			<policy label="pointer"                       domain="pointer"/>
+			<policy label_prefix="wm -> launcher -> menu" domain="panel"/>
+			<policy label="wm -> decorator"               domain="decorator"/>
+			<policy label="status_bar"                    domain="panel"/>
+			<policy                                       domain="default"/>
 
 			<global-key name="KEY_SCROLLLOCK" label="xray_trigger" />
 			<global-key name="KEY_F1"         label="xray_trigger" />
@@ -158,10 +158,10 @@ append config {
 			<service name="Nitpicker"/>
 		</provides>
 		<config>
-			<policy label="decorator" role="decorator"/>
-			<policy label="layouter"  role="layouter"/>
-			<policy label="launcher -> menu" role="direct"/>
-			<policy label="launcher -> testnit" role="direct"/>
+			<policy label="decorator"                  role="decorator"/>
+			<policy label="layouter"                   role="layouter"/>
+			<policy label_prefix="launcher -> menu"    role="direct"/>
+			<policy label_prefix="launcher -> testnit" role="direct"/>
 		</config>
 		<route>
 			<any-service>
@@ -213,7 +213,7 @@ append config {
 					<has_value input="xray_enabled" value="yes" />
 					<then>
 						<inline>
-							<policy label="" color="#ff0000" gradient="75" />
+							<policy color="#ff0000" gradient="75" />
 						</inline>
 					</then>
 				</if>
diff --git a/repos/gems/run/menu_view.run b/repos/gems/run/menu_view.run
index 2a0177bc8..a5377a65a 100644
--- a/repos/gems/run/menu_view.run
+++ b/repos/gems/run/menu_view.run
@@ -53,10 +53,10 @@ append config {
 		<provides><service name="Nitpicker"/></provides>
 		<config>
 			<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />
-			<domain name=""        layer="3" content="client" label="no" hover="always" />
+			<domain name="default" layer="3" content="client" label="no" hover="always" />
 
 			<policy label="pointer" domain="pointer"/>
-			<policy label=""        domain=""/>
+			<policy domain="default"/>
 		</config>
 	</start>
 	<start name="pointer">
diff --git a/repos/gems/run/mixer_gui_qt_test.run b/repos/gems/run/mixer_gui_qt_test.run
index 2390a932d..d5cdf8ceb 100644
--- a/repos/gems/run/mixer_gui_qt_test.run
+++ b/repos/gems/run/mixer_gui_qt_test.run
@@ -77,15 +77,15 @@ append config {
 		</provides>
 		<config>
 			<rom>
-				<policy label="layouter -> window_list"     report="wm -> window_list"/>
-				<policy label="layouter -> focus_request"   report="wm -> focus_request"/>
-				<policy label="decorator -> window_layout"  report="layouter -> window_layout"/>
-				<policy label="wm -> resize_request"        report="layouter -> resize_request"/>
-				<policy label="decorator -> pointer"        report="wm -> pointer"/>
-				<policy label="layouter -> hover"           report="decorator -> hover"/>
-				<policy label="wm -> focus"                 report="layouter -> focus"/>
-				<policy label="mixer_gui_qt -> channel_list"    report="mixer -> channel_list"/>
-				<policy label="mixer -> channel_list"           report="mixer_gui_qt -> channel_list"/>
+				<policy label="layouter -> window_list"      report="wm -> window_list"/>
+				<policy label="layouter -> focus_request"    report="wm -> focus_request"/>
+				<policy label="decorator -> window_layout"   report="layouter -> window_layout"/>
+				<policy label="wm -> resize_request"         report="layouter -> resize_request"/>
+				<policy label="decorator -> pointer"         report="wm -> pointer"/>
+				<policy label="layouter -> hover"            report="decorator -> hover"/>
+				<policy label="wm -> focus"                  report="layouter -> focus"/>
+				<policy label="mixer_gui_qt -> channel_list" report="mixer -> channel_list"/>
+				<policy label="mixer -> channel_list"        report="mixer_gui_qt -> channel_list"/>
 			</rom>
 		</config>
 	</start>
@@ -94,11 +94,11 @@ append config {
 		<provides><service name="Nitpicker"/></provides>
 		<config>
 			<report focus="yes" xray="yes" />
-			<domain name="pointer"   layer="1" content="client" label="no" origin="pointer" />
-			<domain name="default"   layer="2" content="client" label="no" hover="always" focus="click"/>
+			<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />
+			<domain name="default" layer="2" content="client" label="no" hover="always" focus="click"/>
 
-			<policy label="pointer"         domain="pointer"/>
-			<policy label=""                domain="default"/>
+			<policy label="pointer" domain="pointer"/>
+			<policy                 domain="default"/>
 
 			<background color="#000000" />
 		</config>
diff --git a/repos/gems/run/nano3d.run b/repos/gems/run/nano3d.run
index 9a57b6e55..10870ed51 100644
--- a/repos/gems/run/nano3d.run
+++ b/repos/gems/run/nano3d.run
@@ -60,11 +60,11 @@ append config {
 		<resource name="RAM" quantum="1M"/>
 		<provides><service name="Nitpicker"/></provides>
 		<config>
-			<domain name=""       layer="2" content="client" label="no"/>
-			<domain name="nano3d" layer="1" content="client" label="no" origin="pointer"/>
+			<domain name="default" layer="2" content="client" label="no"/>
+			<domain name="nano3d"  layer="1" content="client" label="no" origin="pointer"/>
 
 			<policy label="nano3d" domain="nano3d"/>
-			<policy label=""       domain=""/>
+			<policy domain="default"/>
 		</config>
 	</start>
 
diff --git a/repos/gems/run/nit_fader.run b/repos/gems/run/nit_fader.run
index be59896bc..1378e33a5 100644
--- a/repos/gems/run/nit_fader.run
+++ b/repos/gems/run/nit_fader.run
@@ -52,10 +52,10 @@ append config {
 		<provides><service name="Nitpicker"/></provides>
 		<config>
 			<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />
-			<domain name=""        layer="3" content="client" label="no" focus="click" hover="always" />
+			<domain name="default" layer="3" content="client" label="no" focus="click" hover="always" />
 
 			<policy label="pointer" domain="pointer"/>
-			<policy label=""        domain=""/>
+			<policy domain="default"/>
 		</config>
 	</start>
 	<start name="pointer">
diff --git a/repos/gems/run/terminal_log.run b/repos/gems/run/terminal_log.run
index dcc1d3b4a..7562e223c 100644
--- a/repos/gems/run/terminal_log.run
+++ b/repos/gems/run/terminal_log.run
@@ -86,9 +86,9 @@ append config {
 		<provides><service name="Nitpicker"/></provides>
 		<config>
 			<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />
-			<domain name=""        layer="2" content="client" label="no" focus="click" hover="always" />
+			<domain name="default" layer="2" content="client" label="no" focus="click" hover="always" />
 			<policy label="pointer" domain="pointer"/>
-			<policy label=""        domain=""/>
+			<policy domain="default"/>
 		</config>
 		<route>
 			<service name="Input">       <child name="input_drv"/> </service>
diff --git a/repos/gems/run/wm.run b/repos/gems/run/wm.run
index 4b9828089..74f8a811e 100644
--- a/repos/gems/run/wm.run
+++ b/repos/gems/run/wm.run
@@ -107,7 +107,7 @@ append config {
 			<domain name="default" layer="2" content="client" label="no" hover="always" focus="click" />
 
 			<policy label="pointer" domain="pointer"/>
-			<policy label=""        domain="default"/>
+			<policy domain="default"/>
 		</config>
 	</start>
 	<start name="pointer">
@@ -177,7 +177,7 @@ append config {
 			<launcher name="nitpicker" ram_quota="1M" >
 				<config>
 					<domain name="default" layer="2" />
-					<policy label="" domain="default"/>
+					<policy domain="default"/>
 				</config>
 			</launcher>
 			<launcher name="testnit" ram_quota="768K" />
diff --git a/repos/libports/run/eglgears.run b/repos/libports/run/eglgears.run
index e92dff6bf..29d01a595 100644
--- a/repos/libports/run/eglgears.run
+++ b/repos/libports/run/eglgears.run
@@ -68,9 +68,9 @@ append config {
 		<provides><service name="Nitpicker"/></provides>
 		<config>
 			<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />
-			<domain name=""        layer="2" content="client" focus="click" hover="always" />
+			<domain name="default" layer="2" content="client" focus="click" hover="always" />
 			<policy label="pointer" domain="pointer"/>
-			<policy label=""        domain=""/>
+			<policy domain="default"/>
 		</config>
 		<route><any-service><parent/><any-child/></any-service></route>
 	</start>
diff --git a/repos/libports/run/libc_ffat_fs.run b/repos/libports/run/libc_ffat_fs.run
index 235157c83..27f4b1891 100644
--- a/repos/libports/run/libc_ffat_fs.run
+++ b/repos/libports/run/libc_ffat_fs.run
@@ -60,7 +60,7 @@ set config {
 	<start name="ffat_fs">
 		<resource name="RAM" quantum="4M"/>
 		<provides> <service name="File_system"/> </provides>
-		<config> <policy label="" root="/" writeable="yes" /> </config>
+		<config> <policy root="/" writeable="yes" /> </config>
 	</start>
 	<start name="test-libc_vfs">
 		<resource name="RAM" quantum="2M"/>
diff --git a/repos/libports/run/libc_fs_tar_fs.run b/repos/libports/run/libc_fs_tar_fs.run
index c526cba01..9154f510f 100644
--- a/repos/libports/run/libc_fs_tar_fs.run
+++ b/repos/libports/run/libc_fs_tar_fs.run
@@ -48,7 +48,7 @@ set config {
 		<provides> <service name="File_system"/> </provides>
 		<config>
 			<archive name="libc_fs_tar_fs.tar" />
-			<policy label="" root="/testdir" />
+			<policy root="/testdir" />
 		</config>
 	</start>
 	<start name="test-libc_fs_tar_fs">
diff --git a/repos/libports/run/libc_vfs.run b/repos/libports/run/libc_vfs.run
index 96bb8ccb4..f7820e813 100644
--- a/repos/libports/run/libc_vfs.run
+++ b/repos/libports/run/libc_vfs.run
@@ -34,7 +34,7 @@ set config {
 	<start name="ram_fs">
 		<resource name="RAM" quantum="12M"/>
 		<provides> <service name="File_system"/> </provides>
-		<config> <policy label="" root="/" writeable="yes" /> </config>
+		<config> <policy root="/" writeable="yes" /> </config>
 	</start>
 	<start name="test-libc_vfs">
 		<resource name="RAM" quantum="2M"/>
diff --git a/repos/libports/run/libc_vfs_fs.run b/repos/libports/run/libc_vfs_fs.run
index 484953ea8..264d2a9b8 100644
--- a/repos/libports/run/libc_vfs_fs.run
+++ b/repos/libports/run/libc_vfs_fs.run
@@ -36,7 +36,7 @@ set config {
 		<provides> <service name="File_system"/> </provides>
 		<config>
 			<vfs> <ram/> </vfs>
-			<policy label="" root="/" writeable="yes" />
+			<policy root="/" writeable="yes" />
 		</config>
 	</start>
 	<start name="test-libc_vfs">
diff --git a/repos/libports/run/qt5_common.inc b/repos/libports/run/qt5_common.inc
index 174d5e8d6..5916fd55a 100644
--- a/repos/libports/run/qt5_common.inc
+++ b/repos/libports/run/qt5_common.inc
@@ -77,7 +77,7 @@ proc qt5_start_nodes { feature_arg } {
 				<domain name="default" layer="2" label="no" content="client" focus="click" hover="always" />
 
 				<policy label="pointer" domain="pointer"/>
-				<policy label=""        domain="default"/>
+				<policy domain="default"/>
 			</config>
 		</start>
 
diff --git a/repos/os/run/clipboard.run b/repos/os/run/clipboard.run
index e6a39185a..102f7cb51 100644
--- a/repos/os/run/clipboard.run
+++ b/repos/os/run/clipboard.run
@@ -60,9 +60,9 @@ append config {
 			<flow from="hobby" to="admin" />
 			<flow from="work"  to="admin" />
 
-			<policy label="test-clipboard -> win7"  domain="work"  />
-			<policy label="test-clipboard -> linux" domain="hobby" />
-			<policy label="test-clipboard -> noux"  domain="admin" />
+			<policy label_prefix="test-clipboard -> win7"  domain="work"  />
+			<policy label_prefix="test-clipboard -> linux" domain="hobby" />
+			<policy label_prefix="test-clipboard -> noux"  domain="admin" />
 
 		</config>
 		<route>
diff --git a/repos/os/run/demo.run b/repos/os/run/demo.run
index bc9ea628e..ba5be846d 100644
--- a/repos/os/run/demo.run
+++ b/repos/os/run/demo.run
@@ -152,10 +152,10 @@ append config {
 					</else>
 				</if>
 				<inline>
-					<policy label="pointer"            domain="pointer"/>
-					<policy label="status_bar"         domain="panel"/>
-					<policy label="scout -> launchpad" domain="launchpad"/>
-					<policy label=""                   domain=""/>
+					<policy label="pointer"                   domain="pointer"/>
+					<policy label="status_bar"                domain="panel"/>
+					<policy label_prefix="scout -> launchpad" domain="launchpad"/>
+					<policy                                   domain=""/>
 
 					<global-key name="KEY_SCROLLLOCK" label="xray_trigger" />
 					<global-key name="KEY_F1"         label="xray_trigger" />
@@ -233,7 +233,7 @@ puts $launchpad_config_fd {<config>
 	<launcher name="nitpicker" ram_quota="1M">
 		<config>
 			<domain name="" layer="3" />
-			<policy label="" domain="" />
+			<policy domain="" />
 		</config>
 	</launcher>
 </config>}
diff --git a/repos/os/run/loader.run b/repos/os/run/loader.run
index 6e3b4d138..7aabff8d9 100644
--- a/repos/os/run/loader.run
+++ b/repos/os/run/loader.run
@@ -72,7 +72,7 @@ append config {
 		<resource name="RAM" quantum="1M"/>
 		<provides><service name="Nitpicker"/></provides>
 		<config>
-			<domain name="" layer="2" /> <policy label="" domain=""/>
+			<domain name="" layer="2" /> <policy domain=""/>
 		</config>
 	</start>
 	<start name="loader">
diff --git a/repos/os/run/vfs_stress_fs.run b/repos/os/run/vfs_stress_fs.run
index f74039fb4..c41217005 100644
--- a/repos/os/run/vfs_stress_fs.run
+++ b/repos/os/run/vfs_stress_fs.run
@@ -36,7 +36,7 @@ install_config {
 		<resource name="RAM" quantum="1G"/>
 		<provides><service name="File_system"/></provides>
 		<config>
-			<policy label="" root="/" writeable="yes"/>
+			<policy root="/" writeable="yes"/>
 		</config>
 	</start>
 </config>
diff --git a/repos/ports/run/debug_nitpicker.run b/repos/ports/run/debug_nitpicker.run
index d5dc12566..485fc812b 100644
--- a/repos/ports/run/debug_nitpicker.run
+++ b/repos/ports/run/debug_nitpicker.run
@@ -72,9 +72,9 @@ set config {
 			<target name="nitpicker">
 				<config>
 					<domain name="pointer" layer="1" xray="no" origin="pointer" />
-					<domain name=""        layer="3" />
+					<domain name="default" layer="3" />
 					<policy label="pointer" domain="pointer"/>
-					<policy label=""        domain=""/>
+					<policy domain="default"/>
 				</config>
 			</target>
 			<preserve name="RAM" quantum="2M"/>
diff --git a/repos/ports/run/noux_net_netcat.run b/repos/ports/run/noux_net_netcat.run
index eadd2687f..a22363f15 100644
--- a/repos/ports/run/noux_net_netcat.run
+++ b/repos/ports/run/noux_net_netcat.run
@@ -72,7 +72,7 @@ append_if [have_include "power_on/qemu"] config {
 			<service name="Uart"/>
 		</provides>
 		<config>
-			<policy label="noux" uart="1"/>
+			<policy label="noux_net" uart="1"/>
 		</config>
 	</start>}
 
diff --git a/repos/ports/run/noux_shell_script.run b/repos/ports/run/noux_shell_script.run
index 3ebc87b14..8dae623a2 100644
--- a/repos/ports/run/noux_shell_script.run
+++ b/repos/ports/run/noux_shell_script.run
@@ -136,7 +136,7 @@ foreach pkg $noux_pkgs {
 
 append config {
 				<dir name="home"> <fs label="home" /> </dir>
-				<dir name="ram"> <fs label="root" /> </dir>
+				<dir name="ram">  <fs label="root" /> </dir>
 
 			</fstab>
 			<start name="/bin/bash">
diff --git a/repos/ports/run/noux_terminal_fs.run b/repos/ports/run/noux_terminal_fs.run
index 82429cd3e..dd397386c 100644
--- a/repos/ports/run/noux_terminal_fs.run
+++ b/repos/ports/run/noux_terminal_fs.run
@@ -91,9 +91,9 @@ append config {
 		<provides><service name="Nitpicker"/></provides>
 		<config>
 			<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />
-			<domain name=""        layer="2" content="client" focus="click" />
+			<domain name="default" layer="2" content="client" focus="click" />
 			<policy label="pointer" domain="pointer"/>
-			<policy label=""        domain=""/>
+			<policy domain="default"/>
 		</config>
 		<route> }
 append_if [have_spec ps2] config {
diff --git a/repos/ports/run/noux_trace_fs.run b/repos/ports/run/noux_trace_fs.run
index c8951b325..a18a51301 100644
--- a/repos/ports/run/noux_trace_fs.run
+++ b/repos/ports/run/noux_trace_fs.run
@@ -166,9 +166,9 @@ append config {
 foreach pkg $noux_pkgs {
 append config "								<tar name=\"$pkg.tar\" />" }
 append config {
-				<dir name="home"> <fs label="home" /> </dir>
-				<dir name="ram"> <fs label="root" /> </dir>
-				<dir name="tmp"> <fs label="tmp" /> </dir>
+				<dir name="home">  <fs label="home" />  </dir>
+				<dir name="ram">   <fs label="root" />  </dir>
+				<dir name="tmp">   <fs label="tmp" />   </dir>
 				<dir name="trace"> <fs label="trace" /> </dir>
 
 				<dir name="dev">
diff --git a/repos/ports/run/noux_two_terminal_fs.run b/repos/ports/run/noux_two_terminal_fs.run
index 187a773cf..9dbee5325 100644
--- a/repos/ports/run/noux_two_terminal_fs.run
+++ b/repos/ports/run/noux_two_terminal_fs.run
@@ -91,9 +91,9 @@ append config {
 		<provides><service name="Nitpicker"/></provides>
 		<config>
 			<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />
-			<domain name=""        layer="2" content="client" focus="click" />
+			<domain name="default" layer="2" content="client" focus="click" />
 			<policy label="pointer" domain="pointer"/>
-			<policy label=""        domain=""/>
+			<policy domain="default"/>
 		</config>
 		<route> }
 append_if [have_spec ps2] config {
diff --git a/repos/ports/run/seoul.inc b/repos/ports/run/seoul.inc
index 752e93967..f5465966d 100644
--- a/repos/ports/run/seoul.inc
+++ b/repos/ports/run/seoul.inc
@@ -296,7 +296,7 @@ append_if $use_fancy_stuff config {
 			                       hover="always" ypos="18" height="-18" />
 			<policy label="pointer"    domain="pointer"/>
 			<policy label="status_bar" domain="panel"/>
-			<policy label=""           domain=""/>
+			<policy domain=""/>
 		</config>
 		<route>
 			<service name="Timer">      <child name="timer"/></service>
diff --git a/repos/ports/run/vbox_auto_win7_share.run b/repos/ports/run/vbox_auto_win7_share.run
index 867ef7f57..c6874eda1 100644
--- a/repos/ports/run/vbox_auto_win7_share.run
+++ b/repos/ports/run/vbox_auto_win7_share.run
@@ -176,7 +176,7 @@ set config_of_app {
 				<rom name="test.bin" />
 				<rom name="template.bat" />
 			</content>
-			<policy label="" root="/" writeable="no" />
+			<policy root="/" writeable="no" />
 		</config>
 	</start>
 
@@ -185,7 +185,7 @@ set config_of_app {
 		<resource name="RAM" quantum="64M"/>
 		<provides><service name="File_system"/></provides>
 		<config>
-			<policy label="" root="/" writeable="yes" />
+			<policy root="/" writeable="yes" />
 		</config>
 	</start>
 
diff --git a/repos/ports/run/vbox_pointer.run b/repos/ports/run/vbox_pointer.run
index e64a75758..625af1f30 100644
--- a/repos/ports/run/vbox_pointer.run
+++ b/repos/ports/run/vbox_pointer.run
@@ -96,11 +96,11 @@ set config {
 			<report focus="yes" hover="yes" xray="yes"/>
 			<domain name="pointer"    layer="1" content="client" label="no" origin="pointer"/>
 			<domain name="smiley"     layer="3" content="client" label="no"/>
-			<domain name=""           layer="3" content="client" label="no"/>
+			<domain name="default"    layer="3" content="client" label="no"/>
 
 			<policy label="pointer"            domain="pointer"/>
 			<policy label="test-domain-smiley" domain="smiley"/>
-			<policy label=""                   domain=""/>
+			<policy                            domain="default"/>
 
 			<background color="#00426f"/> <!-- indigo -->
 		</config>
diff --git a/repos/ports/run/vbox_win.inc b/repos/ports/run/vbox_win.inc
index 25843adc6..55e04b825 100644
--- a/repos/ports/run/vbox_win.inc
+++ b/repos/ports/run/vbox_win.inc
@@ -118,7 +118,7 @@ append config_of_app {
 
 			<policy label="vbox_pointer" domain="pointer"/>
 			<policy label="nit_fb"       domain="vbox"/>
-			<policy label=""             domain=""/>
+			<policy domain=""/>
 		</config>
 	</start>
 
diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc
index 19438979b..ffcb98f68 100644
--- a/repos/ports/run/virtualbox_auto.inc
+++ b/repos/ports/run/virtualbox_auto.inc
@@ -75,7 +75,7 @@ set config {
 	<start name="rump_fs" priority="-1">
 		<resource name="RAM" quantum="32M" />
 		<provides><service name="File_system"/></provides>
-		<config fs="ext2fs"><policy label="" root="/" writeable="yes"/></config>
+		<config fs="ext2fs"><policy root="/" writeable="yes"/></config>
 		<route>
 			<any-service><child name="part_blk"/> <parent/><any-child/></any-service>
 		</route>