diff --git a/repos/gems/recipes/pkg/depot_download/archives b/repos/gems/recipes/pkg/depot_download/archives index c1e4c5037..0371c8381 100644 --- a/repos/gems/recipes/pkg/depot_download/archives +++ b/repos/gems/recipes/pkg/depot_download/archives @@ -15,4 +15,5 @@ _/src/init _/src/chroot _/src/libarchive _/src/liblzma +_/src/vfs _/raw/depot_download diff --git a/repos/gems/recipes/pkg/sculpt/archives b/repos/gems/recipes/pkg/sculpt/archives index 6f03cc668..eb6ec67fd 100644 --- a/repos/gems/recipes/pkg/sculpt/archives +++ b/repos/gems/recipes/pkg/sculpt/archives @@ -27,6 +27,7 @@ _/src/bash-minimal _/src/vim-minimal _/src/coreutils-minimal _/src/vfs +_/src/vfs_lxip _/src/rump _/src/ipxe_nic_drv _/src/chroot diff --git a/repos/gems/recipes/raw/depot_download/depot_download.config b/repos/gems/recipes/raw/depot_download/depot_download.config index 80e3fd285..92a9c9636 100644 --- a/repos/gems/recipes/raw/depot_download/depot_download.config +++ b/repos/gems/recipes/raw/depot_download/depot_download.config @@ -2,6 +2,7 @@ + @@ -34,6 +35,25 @@ + + + + + + + + nameserver 213.73.91.35 + + + + + + + + + + + @@ -80,6 +100,7 @@ + diff --git a/repos/gems/run/depot_download.run b/repos/gems/run/depot_download.run index 25786f1fe..0947a121b 100644 --- a/repos/gems/run/depot_download.run +++ b/repos/gems/run/depot_download.run @@ -4,6 +4,7 @@ import_from_depot genodelabs/src/[base_src] \ genodelabs/src/report_rom \ genodelabs/src/fs_rom \ genodelabs/src/vfs \ + genodelabs/src/vfs_lxip \ genodelabs/src/fetchurl \ genodelabs/src/libc \ genodelabs/src/libssh \ @@ -91,7 +92,7 @@ append config { - + diff --git a/repos/gems/run/sculpt/download_runtime.config b/repos/gems/run/sculpt/download_runtime.config index af22f27dc..e1fb06086 100644 --- a/repos/gems/run/sculpt/download_runtime.config +++ b/repos/gems/run/sculpt/download_runtime.config @@ -108,10 +108,17 @@ - + - + + + nameserver 213.73.91.35 + + + + + 2000-01-01 00:00 diff --git a/repos/gems/run/sculpt/update_runtime.config b/repos/gems/run/sculpt/update_runtime.config index 94a43cb6d..f0471cbae 100644 --- a/repos/gems/run/sculpt/update_runtime.config +++ b/repos/gems/run/sculpt/update_runtime.config @@ -92,7 +92,7 @@ - + diff --git a/repos/gems/src/app/depot_download_manager/gen_fetchurl.cc b/repos/gems/src/app/depot_download_manager/gen_fetchurl.cc index 4fb9a84f4..221ffef4a 100644 --- a/repos/gems/src/app/depot_download_manager/gen_fetchurl.cc +++ b/repos/gems/src/app/depot_download_manager/gen_fetchurl.cc @@ -27,6 +27,7 @@ void Depot_download_manager::gen_fetchurl_start_content(Xml_generator &xml, xml.attribute("stdout", "/dev/log"); xml.attribute("stderr", "/dev/log"); xml.attribute("rtc", "/dev/rtc"); + xml.attribute("socket", "/socket"); }); xml.node("vfs", [&] () { xml.node("dir", [&] () { @@ -44,6 +45,8 @@ void Depot_download_manager::gen_fetchurl_start_content(Xml_generator &xml, xml.append(date.string()); }); }); + xml.node("fs", [&] () { + xml.attribute("label", "tcpip"); }); }); import.for_each_download([&] (Archive::Path const &path) { @@ -74,11 +77,16 @@ void Depot_download_manager::gen_fetchurl_start_content(Xml_generator &xml, xml.node("parent", [&] () { xml.attribute("label", "public_rw"); }); }); + xml.node("service", [&] () { + xml.attribute("name", File_system::Session::service_name()); + xml.attribute("label", "tcpip"); + xml.node("parent", [&] () { + xml.attribute("label", "tcpip"); }); + }); gen_parent_unscoped_rom_route(xml, "fetchurl"); gen_parent_unscoped_rom_route(xml, "ld.lib.so"); gen_parent_rom_route(xml, "libc.lib.so"); gen_parent_rom_route(xml, "libm.lib.so"); - gen_parent_rom_route(xml, "lwip.lib.so"); gen_parent_rom_route(xml, "curl.lib.so"); gen_parent_rom_route(xml, "libssh.lib.so"); gen_parent_rom_route(xml, "libssl.lib.so");