diff --git a/snippet.diff b/snippet.diff deleted file mode 100644 index c9e0080..0000000 --- a/snippet.diff +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/PVE/API2/Storage/Status.pm b/PVE/API2/Storage/Status.pm -index 9a5a952..fd7ac5f 100644 ---- a/PVE/API2/Storage/Status.pm -+++ b/PVE/API2/Storage/Status.pm -@@ -417,8 +417,10 @@ __PACKAGE__->register_method ({ - raise_param_exc({ filename => "missing '.tar.gz' or '.tar.xz' extension" }); - } - $path = PVE::Storage::get_vztmpl_dir($cfg, $param->{storage}); -- } else { -- raise_param_exc({ content => "upload content type '$content' not allowed" }); -+ } elsif ($content eq 'snippets') { -+ $path = PVE::Storage::get_snippet_dir($cfg, $param->{storage}); -+ } else { -+ raise_param_exc({ content => "upload content type '$content' not allowed" }); - } - - die "storage '$param->{storage}' does not support '$content' content\n" -diff --git a/PVE/Storage.pm b/PVE/Storage.pm -index eb5e86f..bc0981b 100755 ---- a/PVE/Storage.pm -+++ b/PVE/Storage.pm -@@ -340,6 +340,15 @@ sub get_iso_dir { - return $plugin->get_subdir($scfg, 'iso'); - } - -+sub get_snippet_dir { -+ my ($cfg, $storeid) = @_; -+ -+ my $scfg = storage_config($cfg, $storeid); -+ my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); -+ -+ return $plugin->get_subdir($scfg, 'snippets'); -+} -+ - sub get_vztmpl_dir { - my ($cfg, $storeid) = @_; diff --git a/snippets.patch b/snippets.patch new file mode 100644 index 0000000..57c4113 --- /dev/null +++ b/snippets.patch @@ -0,0 +1,29 @@ +--- PVE/Storage.pm.old 2020-11-02 19:09:57.318839122 +0100 ++++ PVE/Storage.pm 2020-11-02 19:10:52.910426246 +0100 +@@ -363,6 +363,15 @@ + return $plugin->get_subdir($scfg, 'iso'); + } + ++sub get_snippet_dir { ++ my ($cfg, $storeid) = @_; ++ ++ my $scfg = storage_config($cfg, $storeid); ++ my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); ++ ++ return $plugin->get_subdir($scfg, 'snippets'); ++} ++ + sub get_vztmpl_dir { + my ($cfg, $storeid) = @_; + +--- PVE/API2/Storage/Status.pm.old 2020-11-02 19:09:03.207241634 +0100 ++++ PVE/API2/Storage/Status.pm 2020-11-02 19:09:26.631067308 +0100 +@@ -424,6 +424,8 @@ + raise_param_exc({ filename => "missing '.tar.gz' or '.tar.xz' extension" }); + } + $path = PVE::Storage::get_vztmpl_dir($cfg, $param->{storage}); ++ } elsif ($content eq 'snippets') { ++ $path = PVE::Storage::get_snippet_dir($cfg, $param->{storage}); + } else { + raise_param_exc({ content => "upload content type '$content' not allowed" }); + }