diff --git a/repos/ports/run/vbox_share.inc b/repos/ports/run/vbox_share.inc
index d3f7b9228..22bea0341 100644
--- a/repos/ports/run/vbox_share.inc
+++ b/repos/ports/run/vbox_share.inc
@@ -103,11 +103,9 @@ catch { exec dd if=/dev/urandom of=bin/test.bin bs=4096 count=8160 }
#
set build_components {
server/input_merger
- server/ram_fs server/report_rom
+ server/ram_fs server/report_rom server/fs_rom server/vfs
server/tcp_terminal drivers/nic
- lib/libc_noux
- lib/vfs/lwip
- noux
+ lib/vfs/lwip lib/vfs/pipe
}
#
@@ -117,9 +115,9 @@ foreach pkg {bash coreutils} {
lappend_if [expr ![file exists bin/$pkg]] build_components noux-pkg/$pkg }
set boot_modules {
- ram_fs
- noux libc_noux.lib.so posix.lib.so bash.tar coreutils.tar
- tcp_terminal vfs_lwip.lib.so ipxe_nic_drv report_rom
+ ram_fs vfs fs_rom
+ posix.lib.so bash.tar coreutils.tar
+ tcp_terminal vfs_lwip.lib.so vfs_pipe.lib.so ipxe_nic_drv report_rom
input_merger
test.bin template.bat
}
@@ -137,7 +135,7 @@ set config_of_app {
-
+
@@ -146,31 +144,6 @@ set config_of_app {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -193,6 +166,69 @@ set config_of_app {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2018-01-01 00:01
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -334,37 +370,37 @@ run_genode_until {\[init -\> vbox1\].*Guest Additions capability report:.*seamle
puts "\nTest shared folder\n"
spawn netcat $serial_ip_addr 8888
-set noux_id $spawn_id
-set spawn_id_list [list $noux_id $serial_id]
+set netcat_id $spawn_id
+set spawn_id_list [list $netcat_id $serial_id]
run_genode_until {\[init -> tcp_terminal\] connection established} 20 $spawn_id_list
#
-# Step 5 : interact with netcat -> ... -> tcp_terminal -> Noux -> bash
+# Step 5 : interact with netcat -> ... -> tcp_terminal -> /bin/bash
#
# Windows does not like trailing zeros introduced by our ROM service.
# -> .bat script does not find labels like 'check' with zero bytes
# so - delete zero bytes
-puts $noux_id "cat from/template\.bat | tr -d \"\\0\" >to/test\.bat"
+puts $netcat_id "cat from/template\.bat | tr -d \"\\0\" >to/test\.bat"
# SHA1 of original file
-puts $noux_id "sha1sum from/test.bin"
+puts $netcat_id "sha1sum from/test.bin"
# Tell Windows VM to start copying
-puts $noux_id "echo \"start\" > to/start\.txt"
+puts $netcat_id "echo \"start\" > to/start\.txt"
# Wait until Windows finished copying
-puts $noux_id "while \[ ! -f to/done\.txt ]"
-puts $noux_id "do"
-puts $noux_id "sleep 5"
-puts $noux_id "done"
+puts $netcat_id "while \[ ! -f to/done\.txt ]"
+puts $netcat_id "do"
+puts $netcat_id "sleep 5"
+puts $netcat_id "done"
# Wait until VM signaled shutdown state
run_genode_until {\[init\] child "vbox1" exited with exit value 0} 120 $spawn_id_list
# SHA1 of copied file
-puts $noux_id "sha1sum to/test.bin"
+puts $netcat_id "sha1sum to/test.bin"
# Wait for output of bash shell until last SHA1 sum is calculated
run_genode_until {[[:xdigit:]]+ to/test\.bin} 50 $spawn_id_list