[pve-devel] [PATCH manager 1/3] api/services: sort service list

[pve-devel] [PATCH manager 1/3] api/services: sort service list

[Dominik Csapak]

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 PVE/API2/Services.pm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/PVE/API2/Services.pm b/PVE/API2/Services.pm
index f0159b65..60502ce2 100644
--- a/PVE/API2/Services.pm
+++ b/PVE/API2/Services.pm
@@ -17,24 +17,24 @@ use IO::File;
 use base qw(PVE::RESTHandler);
 
 my $service_name_list = [
-    'pveproxy',
-    'pvedaemon',
-    'spiceproxy',
-    'pvestatd',
-    'pve-cluster',
+    'chrony',
     'corosync',
+    'cron',
+    'ksmtuned',
+    'postfix',
+    'pve-cluster',
     'pve-firewall',
-    'pvefw-logger',
     'pve-ha-crm',
     'pve-ha-lrm',
+    'pvedaemon',
+    'pvefw-logger',
+    'pveproxy',
+    'pvestatd',
+    'spiceproxy',
     'sshd',
     'syslog',
     'systemd-journald',
-    'cron',
-    'postfix',
-    'ksmtuned',
     'systemd-timesyncd',
-    'chrony',
 ];
 my $essential_services = {
     pveproxy => 1,
-- 
2.30.2

[pve-devel] [PATCH manager 2/3] api/services: add pvescheduler to the service list

[Dominik Csapak]

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 PVE/API2/Services.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/PVE/API2/Services.pm b/PVE/API2/Services.pm
index 60502ce2..40f7504a 100644
--- a/PVE/API2/Services.pm
+++ b/PVE/API2/Services.pm
@@ -29,6 +29,7 @@ my $service_name_list = [
     'pvedaemon',
     'pvefw-logger',
     'pveproxy',
+    'pvescheduler',
     'pvestatd',
     'spiceproxy',
     'sshd',
-- 
2.30.2

[pve-devel] [PATCH manager 3/3] jobs: vzdump: fixup prune-schedule conf

[Dominik Csapak]

when we parse the config, we get the 'prune-backup' decoded, but the
api call we use wants it as a property string, so encode it here again

this fixes having jobs with prune options

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 PVE/Jobs/VZDump.pm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/PVE/Jobs/VZDump.pm b/PVE/Jobs/VZDump.pm
index 92b81147..c757eea1 100644
--- a/PVE/Jobs/VZDump.pm
+++ b/PVE/Jobs/VZDump.pm
@@ -72,6 +72,12 @@ sub run {
 	delete $conf->{$opt} if !defined($props->{$opt});
     }
 
+    # fixup prune-backups, we get it decoded but want it as string parameter
+    $conf->{'prune-backups'} = PVE::JSONSchema::print_property_string(
+	$conf->{'prune-backups'},
+	'prune-backups',
+    ) if $conf->{'prune-backups'} && ref($conf->{'prune-backups'}) eq 'HASH';
+
     $conf->{quiet} = 1; # do not write to stdout/stderr
 
     PVE::Cluster::cfs_update(); # refresh vmlist
-- 
2.30.2

[pve-devel] applied-series: [PATCH manager 1/3] api/services: sort service list

[Thomas Lamprecht]

On 12.11.21 13:37, Dominik Csapak wrote:
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
>  PVE/API2/Services.pm | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
> 
>

applied series, thanks!