Am 15.11.24 um 15:00 schrieb Markus Frank: > Adds a config file for directories by using a 'map' property string for > each node mapping.
To be used for exposing Virtiofs and bindmounts (?) to VMs/CTs respectively. Out of interest, can you (or anybody else) think of any other specific use case this mapping could serve to? > Next to node & path, there is the optional submounts parameter in the > map property string that is used to announce other mounted file systems > in the specified directory. Announce to where? And should that be encoded in the name? Like with 'expose-sub-mounts' > > Additionally there are the default settings for xattr & acl. Might be good to mention what effect they have also in the docs patch, I just saw the interaction between them described there. Also, they seem very virtiofs specific, maybe sum them up in a format string else it might get weird if we reuse this for other places where those options might not make any sense. E.g.: virtiofs-opts: [expose-xacl=<1|0>][,expose-acl=<1|0>] > > example config: > ``` > some-dir-id Are you sure this is valid? doesn't the section config also needs a type? > map node=node1,path=/mnt/share/,submounts=1 > map node=node2,path=/mnt/share/, > xattr 1 > acl 1 > ``` > FWIW, I considered if a new content-type of the storage could be re-used, and it would be doable, but it would be probably quite odd to use and not have any extra benefits. > Signed-off-by: Markus Frank <m.fr...@proxmox.com> > --- > src/Makefile | 1 + > src/PVE/Mapping/Dir.pm | 204 +++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 205 insertions(+) > create mode 100644 src/PVE/Mapping/Dir.pm > > diff --git a/src/Makefile b/src/Makefile > index cbc40c1..030e7f7 100644 > --- a/src/Makefile > +++ b/src/Makefile > @@ -15,6 +15,7 @@ install: PVE > install -m 0644 PVE/StorageTunnel.pm ${PERL5DIR}/PVE/ > install -m 0644 PVE/Tunnel.pm ${PERL5DIR}/PVE/ > install -d ${PERL5DIR}/PVE/Mapping > + install -m 0644 PVE/Mapping/Dir.pm ${PERL5DIR}/PVE/Mapping/ > install -m 0644 PVE/Mapping/PCI.pm ${PERL5DIR}/PVE/Mapping/ > install -m 0644 PVE/Mapping/USB.pm ${PERL5DIR}/PVE/Mapping/ > install -d ${PERL5DIR}/PVE/VZDump > diff --git a/src/PVE/Mapping/Dir.pm b/src/PVE/Mapping/Dir.pm > new file mode 100644 > index 0000000..6a343b1 > --- /dev/null > +++ b/src/PVE/Mapping/Dir.pm > @@ -0,0 +1,204 @@ > +package PVE::Mapping::Dir; > + > +use strict; > +use warnings; > + > +use PVE::Cluster qw(cfs_register_file cfs_read_file cfs_lock_file > cfs_write_file); > +use PVE::INotify; > +use PVE::JSONSchema qw(get_standard_option parse_property_string); > +use PVE::SectionConfig; > + > +use base qw(PVE::SectionConfig); > + > +my $FILENAME = 'mapping/dir.cfg'; > + > +cfs_register_file($FILENAME, > + sub { __PACKAGE__->parse_config(@_); }, > + sub { __PACKAGE__->write_config(@_); }); > + > + > +# so we don't have to repeat the type every time > +sub parse_section_header { > + my ($class, $line) = @_; > + > + if ($line =~ m/^(\S+)\s*$/) { > + my $id = $1; > + my $errmsg = undef; # set if you want to skip whole section > + eval { PVE::JSONSchema::pve_verify_configid($id) }; > + $errmsg = $@ if $@; > + my $config = {}; # to return additional attributes > + return ('dir', $id, $errmsg, $config); > + } > + return undef; > +} > + > +sub format_section_header { > + my ($class, $type, $sectionId, $scfg, $done_hash) = @_; > + > + return "$sectionId\n"; > +} > + > +sub type { > + return 'dir'; > +} > + > +my $map_fmt = { > + node => get_standard_option('pve-node'), > + path => { > + description => "Absolute directory path that should be shared with the > guest.", > + type => 'string', > + format => 'pve-storage-path', > + }, > + submounts => { > + type => 'boolean', > + description => "Announce that the directory contains other mounted" > + ." file systems. If this is not set and multiple file systems are" > + ." mounted, the guest may encounter duplicates due to file system" > + ." specific inode IDs.", it's fine to go to 100 character columns per line for these _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel