diff --git a/base-okl4/run/priority.run b/base-okl4/run/priority.run
index f544ce9f71..7a57f5ec87 100644
--- a/base-okl4/run/priority.run
+++ b/base-okl4/run/priority.run
@@ -4,14 +4,14 @@ build "core init"
create_boot_directory
-install_config "[exec cat [genode_dir]/os/config/priority]"
+install_config "[exec cat [genode_dir]/os/src/init/config.priority]"
build_boot_image "core init"
append qemu_args "-nographic -m 256"
# run genode until the init->init.2 process gives us a life sign
-run_genode_until "init.2.*abort called.*\n" 100
+run_genode_until "init.2.*No children to start.*\n" 100
puts "dumping priorities using the kernel debugger..."
@@ -34,9 +34,9 @@ set output $expect_out(buffer)
grep_output {^\[}
compare_output_to {
- [128]: (roottask) (activati) (pager) (ioport) (init) (init) (init.1) (init.1) (init.2) (init.11) (init.12)
- [112]: (init.11)
- [ 96]: (init.12) (init.121) {init.121}
- [ 64]: (init.2)
+ [128]: (roottask) (entrypoi) (pager) (signal) (ioport) (init) {init} (signal h) (init.1) {init.1} (init.2) (signal h) (init.11) (init.12)
+ [112]: {init.11} (signal h)
+ [ 96]: {init.12} (signal h) (init.121) {init.121} (signal h)
+ [ 64]: {init.2} (signal h)
}
diff --git a/os/config/bomb b/os/config/bomb
deleted file mode 100644
index 5e43ff143c..0000000000
--- a/os/config/bomb
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/os/config/nested_config b/os/config/nested_config
deleted file mode 100644
index bbb5314214..0000000000
--- a/os/config/nested_config
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/os/run/bomb.run b/os/run/bomb.run
index 687d9525a2..eeef0f6f53 100644
--- a/os/run/bomb.run
+++ b/os/run/bomb.run
@@ -2,7 +2,32 @@ build "core init test/bomb drivers/timer"
create_boot_directory
-install_config [exec cat "[genode_dir]/os/config/bomb"]
+install_config {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
build_boot_image "core init bomb timer"
diff --git a/os/config/priority b/os/src/init/config.priority
similarity index 87%
rename from os/config/priority
rename to os/src/init/config.priority
index 878b758da3..e4f4d36679 100644
--- a/os/config/priority
+++ b/os/src/init/config.priority
@@ -32,6 +32,7 @@ nodes:
+
@@ -55,6 +56,7 @@ nodes:
+
@@ -70,6 +72,16 @@ nodes:
+
+
+
+
+
+
+
+
+
+