mirror of
https://github.com/genodelabs/genode.git
synced 2025-05-02 08:42:52 +00:00
2c8beb462f
This patch changes the way of how the client-selected sub directory is communicated to the server. The former opaque session argument is now passed as last label element, which allows for the flexible tweaking of this argument by init's session-routing and label-rewriting mechansims. In particular, it alleviates the need for creating chroot component instances. This change requires the following four adaptations at the configuration level: - Each file-system session request must now carry a path starting with / as last session arguments. Hence, <vfs> <fs> nodes that feature a 'label' attributes must extend the attribute value with " -> /". For <fs> nodes with no label attribute, "/" is used as last label argument by default. - For matching session-routing rules at init's configuration, the matching of full labels should be replaced by 'label_prefix' matches, excluding the last (path) argument. - Wherever a label of a file-system session is rewritten by using init's 'label' attribute of a <parent> or <child> target node, the new attribute 'identity' should be used instead. This replaces the identity part of the label while preserving the client's directory argument. - Analogously to the matching of session-routing rules, server-side policy-selection rules that formerly matched a concrete 'label' must be changed to match a 'label_prefix' instead. As a good practice, 'label_prefix' values should end with " ->" if possible, which clearly delimits the identity part of the label used by the matching. Issue #5445
138 lines
4.0 KiB
Plaintext
138 lines
4.0 KiB
Plaintext
build { init app/depot_query app/depot_deploy }
|
|
|
|
create_boot_directory
|
|
|
|
import_from_depot [depot_user]/src/[base_src] \
|
|
[depot_user]/src/report_rom \
|
|
[depot_user]/src/fs_rom \
|
|
[depot_user]/src/vfs \
|
|
[depot_user]/src/init
|
|
|
|
create_tar_from_depot_binaries [run_dir]/genode/depot.tar \
|
|
[depot_user]/pkg/test-fs_report
|
|
|
|
proc query_pkg {} {
|
|
return test-fs_report/[_current_depot_archive_version pkg test-fs_report] }
|
|
|
|
install_config {
|
|
<config>
|
|
<parent-provides>
|
|
<service name="ROM"/>
|
|
<service name="IRQ"/>
|
|
<service name="IO_MEM"/>
|
|
<service name="IO_PORT"/>
|
|
<service name="PD"/>
|
|
<service name="RM"/>
|
|
<service name="CPU"/>
|
|
<service name="LOG"/>
|
|
</parent-provides>
|
|
|
|
<default-route>
|
|
<any-service> <parent/> <any-child/> </any-service>
|
|
</default-route>
|
|
<default caps="100" ram="1M"/>
|
|
|
|
<start name="timer">
|
|
<provides> <service name="Timer"/> </provides>
|
|
</start>
|
|
|
|
<start name="report_rom">
|
|
<binary name="report_rom"/>
|
|
<provides> <service name="Report"/> <service name="ROM"/> </provides>
|
|
<config verbose="yes">
|
|
<policy label="depot_deploy -> blueprint" report="depot_query -> blueprint"/>
|
|
<policy label="depot_query -> query" report="depot_deploy -> query"/>
|
|
<policy label="dynamic -> config" report="depot_deploy -> init.config"/>
|
|
</config>
|
|
</start>
|
|
|
|
<start name="vfs" ram="4M">
|
|
<provides> <service name="File_system"/> </provides>
|
|
<config>
|
|
<vfs>
|
|
<tar name="depot.tar"/>
|
|
<dir name="badguy">
|
|
<dir name="pkg">
|
|
<dir name="invalid">
|
|
<dir name="current">
|
|
<inline name="archives"/>
|
|
<inline name="runtime">
|
|
<runtime ram="1M" caps="100" binary="chroot">
|
|
<content>
|
|
<rom label="chroot"/>
|
|
</content>
|
|
</runtime>
|
|
</inline>
|
|
</dir>
|
|
</dir>
|
|
</dir>
|
|
</dir>
|
|
</vfs>
|
|
<policy label_prefix="depot_query -> depot ->" root="/" />
|
|
<policy label_prefix="fs_rom ->" root="/" />
|
|
</config>
|
|
</start>
|
|
|
|
<start name="fs_rom" ram="4M">
|
|
<provides> <service name="ROM"/> </provides>
|
|
</start>
|
|
|
|
<start name="depot_query" ram="2M">
|
|
<config query="rom">
|
|
<vfs> <dir name="depot"> <fs label="depot -> /"/> </dir> </vfs>
|
|
</config>
|
|
<route>
|
|
<service name="ROM" label="query"> <child name="report_rom"/> </service>
|
|
<any-service> <parent/> <any-child/> </any-service>
|
|
</route>
|
|
</start>
|
|
|
|
<start name="depot_deploy">
|
|
<config arch="} [depot_spec] {">
|
|
<static>
|
|
<parent-provides>
|
|
<service name="ROM"/>
|
|
<service name="CPU"/>
|
|
<service name="PD"/>
|
|
<service name="LOG"/>
|
|
<service name="Timer"/>
|
|
</parent-provides>
|
|
</static>
|
|
<common_routes>
|
|
<service name="ROM" label_last="ld.lib.so"> <parent/> </service>
|
|
<service name="ROM" label_last="init"> <parent/> </service>
|
|
<service name="CPU"> <parent/> </service>
|
|
<service name="PD"> <parent/> </service>
|
|
<service name="LOG"> <parent/> </service>
|
|
<service name="Timer"> <parent/> </service>
|
|
</common_routes>
|
|
<start name="invalid" pkg="badguy/pkg/invalid/current"/>
|
|
<start name="test" pkg="} [depot_user] {/pkg/} [query_pkg] {"/>
|
|
</config>
|
|
<route>
|
|
<service name="ROM" label="blueprint"> <child name="report_rom"/> </service>
|
|
<any-service> <parent/> <any-child/> </any-service>
|
|
</route>
|
|
</start>
|
|
|
|
<start name="dynamic" caps="8000" ram="64M">
|
|
<binary name="init"/>
|
|
<route>
|
|
<service name="ROM" label_last="ld.lib.so"> <parent/> </service>
|
|
<service name="ROM" label_last="init"> <parent/> </service>
|
|
<service name="ROM" label="config"> <child name="report_rom"/> </service>
|
|
<service name="ROM"> <child name="fs_rom"/> </service>
|
|
<service name="Timer"> <child name="timer"/> </service>
|
|
<any-service> <parent/> <any-child/> </any-service>
|
|
</route>
|
|
</start>
|
|
|
|
</config>}
|
|
|
|
build_boot_image [build_artifacts]
|
|
|
|
append qemu_args " -nographic "
|
|
|
|
run_genode_until {.*\] child "test-fs_report" exited with exit value 0.*\n} 30
|
|
|