run make update-static

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/api-viewer/apidata.js b/api-viewer/apidata.js
index cddb8523fcb9aa60e249322b6f85f9720538747f..b3a21f3f616f24af468a9ef10c4ed43928dac510 100644 (file)
--- a/api-viewer/apidata.js
+++ b/api-viewer/apidata.js
@@ -8560,7 +8560,7 @@ var pveapi = [
                                              "format" : "pve-qm-hostpci",
                                              "optional" : 1,
                                              "type" : "string",
                                              "format" : "pve-qm-hostpci",
                                              "optional" : 1,
                                              "type" : "string",

-                                             "verbose_description" : "Map host PCI devices into guest.\n\nNOTE: This option allows direct access to host hardware. So it is no longer \npossible to migrate such machines - use with special care.\n\nCAUTION: Experimental! User reported problems with this option.\n"
+                                             "verbose_description" : "Map host PCI devices into guest.\n\nNOTE: This option allows direct access to host hardware. So it is no longer\npossible to migrate such machines - use with special care.\n\nCAUTION: Experimental! User reported problems with this option.\n"

                                           },
                                           "hotplug" : {
                                              "default" : "network,disk,usb",
                                           },
                                           "hotplug" : {
                                              "default" : "network,disk,usb",


@@ -10716,7 +10716,7 @@ var pveapi = [
                                              "optional" : 1,
                                              "type" : "string",
                                              "typetext" : "[host=]<HOSTPCIID[;HOSTPCIID2...]> [,mdev=<string>] [,pcie=<1|0>] [,rombar=<1|0>] [,romfile=<string>] [,x-vga=<1|0>]",
                                              "optional" : 1,
                                              "type" : "string",
                                              "typetext" : "[host=]<HOSTPCIID[;HOSTPCIID2...]> [,mdev=<string>] [,pcie=<1|0>] [,rombar=<1|0>] [,romfile=<string>] [,x-vga=<1|0>]",

-                                             "verbose_description" : "Map host PCI devices into guest.\n\nNOTE: This option allows direct access to host hardware. So it is no longer \npossible to migrate such machines - use with special care.\n\nCAUTION: Experimental! User reported problems with this option.\n"
+                                             "verbose_description" : "Map host PCI devices into guest.\n\nNOTE: This option allows direct access to host hardware. So it is no longer\npossible to migrate such machines - use with special care.\n\nCAUTION: Experimental! User reported problems with this option.\n"

                                           },
                                           "hotplug" : {
                                              "default" : "network,disk,usb",
                                           },
                                           "hotplug" : {
                                              "default" : "network,disk,usb",


@@ -12947,7 +12947,7 @@ var pveapi = [
                                              "optional" : 1,
                                              "type" : "string",
                                              "typetext" : "[host=]<HOSTPCIID[;HOSTPCIID2...]> [,mdev=<string>] [,pcie=<1|0>] [,rombar=<1|0>] [,romfile=<string>] [,x-vga=<1|0>]",
                                              "optional" : 1,
                                              "type" : "string",
                                              "typetext" : "[host=]<HOSTPCIID[;HOSTPCIID2...]> [,mdev=<string>] [,pcie=<1|0>] [,rombar=<1|0>] [,romfile=<string>] [,x-vga=<1|0>]",

-                                             "verbose_description" : "Map host PCI devices into guest.\n\nNOTE: This option allows direct access to host hardware. So it is no longer \npossible to migrate such machines - use with special care.\n\nCAUTION: Experimental! User reported problems with this option.\n"
+                                             "verbose_description" : "Map host PCI devices into guest.\n\nNOTE: This option allows direct access to host hardware. So it is no longer\npossible to migrate such machines - use with special care.\n\nCAUTION: Experimental! User reported problems with this option.\n"

                                           },
                                           "hotplug" : {
                                              "default" : "network,disk,usb",
                                           },
                                           "hotplug" : {
                                              "default" : "network,disk,usb",


@@ -17504,7 +17504,7 @@ var pveapi = [
                                  "optional" : 1,
                                  "type" : "string",
                                  "typetext" : "[host=]<HOSTPCIID[;HOSTPCIID2...]> [,mdev=<string>] [,pcie=<1|0>] [,rombar=<1|0>] [,romfile=<string>] [,x-vga=<1|0>]",
                                  "optional" : 1,
                                  "type" : "string",
                                  "typetext" : "[host=]<HOSTPCIID[;HOSTPCIID2...]> [,mdev=<string>] [,pcie=<1|0>] [,rombar=<1|0>] [,romfile=<string>] [,x-vga=<1|0>]",

-                                 "verbose_description" : "Map host PCI devices into guest.\n\nNOTE: This option allows direct access to host hardware. So it is no longer \npossible to migrate such machines - use with special care.\n\nCAUTION: Experimental! User reported problems with this option.\n"
+                                 "verbose_description" : "Map host PCI devices into guest.\n\nNOTE: This option allows direct access to host hardware. So it is no longer\npossible to migrate such machines - use with special care.\n\nCAUTION: Experimental! User reported problems with this option.\n"

                               },
                               "hotplug" : {
                                  "default" : "network,disk,usb",
                               },
                               "hotplug" : {
                                  "default" : "network,disk,usb",


@@ -19584,7 +19584,9 @@ var pveapi = [
                                              "description" : "Lock/unlock the VM.",
                                              "enum" : [
                                                 "backup",
                                              "description" : "Lock/unlock the VM.",
                                              "enum" : [
                                                 "backup",

+                                                "create",

                                                 "disk",
                                                 "disk",

+                                                "fstrim",

                                                 "migrate",
                                                 "mounted",
                                                 "rollback",
                                                 "migrate",
                                                 "mounted",
                                                 "rollback",


@@ -20037,7 +20039,9 @@ var pveapi = [
                                              "description" : "Lock/unlock the VM.",
                                              "enum" : [
                                                 "backup",
                                              "description" : "Lock/unlock the VM.",
                                              "enum" : [
                                                 "backup",

+                                                "create",

                                                 "disk",
                                                 "disk",

+                                                "fstrim",

                                                 "migrate",
                                                 "mounted",
                                                 "rollback",
                                                 "migrate",
                                                 "mounted",
                                                 "rollback",


@@ -24691,7 +24695,9 @@ var pveapi = [
                                  "description" : "Lock/unlock the VM.",
                                  "enum" : [
                                     "backup",
                                  "description" : "Lock/unlock the VM.",
                                  "enum" : [
                                     "backup",

+                                    "create",

                                     "disk",
                                     "disk",

+                                    "fstrim",

                                     "migrate",
                                     "mounted",
                                     "rollback",
                                     "migrate",
                                     "mounted",
                                     "rollback",


@@ -27705,6 +27711,20 @@ var pveapi = [
                                        "type" : "boolean",
                                        "typetext" : "<boolean>"
                                     },
                                        "type" : "boolean",
                                        "typetext" : "<boolean>"
                                     },

+                                    "cidr" : {
+                                       "description" : "IPv4 CIDR.",
+                                       "format" : "CIDRv4",
+                                       "optional" : 1,
+                                       "type" : "string",
+                                       "typetext" : "<string>"
+                                    },
+                                    "cidr6" : {
+                                       "description" : "IPv6 CIDR.",
+                                       "format" : "CIDRv6",
+                                       "optional" : 1,
+                                       "type" : "string",
+                                       "typetext" : "<string>"
+                                    },

                                     "comments" : {
                                        "description" : "Comments",
                                        "optional" : 1,
                                     "comments" : {
                                        "description" : "Comments",
                                        "optional" : 1,


@@ -28001,6 +28021,20 @@ var pveapi = [
                                  "type" : "boolean",
                                  "typetext" : "<boolean>"
                               },
                                  "type" : "boolean",
                                  "typetext" : "<boolean>"
                               },

+                              "cidr" : {
+                                 "description" : "IPv4 CIDR.",
+                                 "format" : "CIDRv4",
+                                 "optional" : 1,
+                                 "type" : "string",
+                                 "typetext" : "<string>"
+                              },
+                              "cidr6" : {
+                                 "description" : "IPv6 CIDR.",
+                                 "format" : "CIDRv6",
+                                 "optional" : 1,
+                                 "type" : "string",
+                                 "typetext" : "<string>"
+                              },

                               "comments" : {
                                  "description" : "Comments",
                                  "optional" : 1,
                               "comments" : {
                                  "description" : "Comments",
                                  "optional" : 1,


@@ -33232,6 +33266,79 @@ var pveapi = [
                   "path" : "/nodes/{node}/syslog",
                   "text" : "syslog"
                },
                   "path" : "/nodes/{node}/syslog",
                   "text" : "syslog"
                },

+               {
+                  "info" : {
+                     "GET" : {
+                        "description" : "Read Journal",
+                        "method" : "GET",
+                        "name" : "journal",
+                        "parameters" : {
+                           "additionalProperties" : 0,
+                           "properties" : {
+                              "endcursor" : {
+                                 "description" : "End before the given Cursor. Conflicts with 'until'",
+                                 "optional" : 1,
+                                 "type" : "string",
+                                 "typetext" : "<string>"
+                              },
+                              "lastentries" : {
+                                 "description" : "Limit to the last X lines. Conflicts with a range.",
+                                 "minimum" : 0,
+                                 "optional" : 1,
+                                 "type" : "integer",
+                                 "typetext" : "<integer> (0 - N)"
+                              },
+                              "node" : {
+                                 "description" : "The cluster node name.",
+                                 "format" : "pve-node",
+                                 "type" : "string",
+                                 "typetext" : "<string>"
+                              },
+                              "since" : {
+                                 "description" : "Display all log since this UNIX epoch. Conflicts with 'startcursor'.",
+                                 "minimum" : 0,
+                                 "optional" : 1,
+                                 "type" : "integer",
+                                 "typetext" : "<integer> (0 - N)"
+                              },
+                              "startcursor" : {
+                                 "description" : "Start after the given Cursor. Conflicts with 'since'",
+                                 "optional" : 1,
+                                 "type" : "string",
+                                 "typetext" : "<string>"
+                              },
+                              "until" : {
+                                 "description" : "Display all log until this UNIX epoch. Conflicts with 'endcursor'.",
+                                 "minimum" : 0,
+                                 "optional" : 1,
+                                 "type" : "integer",
+                                 "typetext" : "<integer> (0 - N)"
+                              }
+                           }
+                        },
+                        "permissions" : {
+                           "check" : [
+                              "perm",
+                              "/nodes/{node}",
+                              [
+                                 "Sys.Syslog"
+                              ]
+                           ]
+                        },
+                        "protected" : 1,
+                        "proxyto" : "node",
+                        "returns" : {
+                           "items" : {
+                              "type" : "string"
+                           },
+                           "type" : "array"
+                        }
+                     }
+                  },
+                  "leaf" : 1,
+                  "path" : "/nodes/{node}/journal",
+                  "text" : "journal"
+               },

                {
                   "info" : {
                      "POST" : {
                {
                   "info" : {
                      "POST" : {


@@ -33245,9 +33352,9 @@ var pveapi = [
                                  "default" : "login",
                                  "description" : "Run specific command or default to login.",
                                  "enum" : [
                                  "default" : "login",
                                  "description" : "Run specific command or default to login.",
                                  "enum" : [

-                                    "upgrade",

                                     "ceph_install",
                                     "ceph_install",

-                                    "login"
+                                    "login",
+                                    "upgrade"

                                  ],
                                  "optional" : 1,
                                  "type" : "string"
                                  ],
                                  "optional" : 1,
                                  "type" : "string"


@@ -33339,9 +33446,9 @@ var pveapi = [
                                  "default" : "login",
                                  "description" : "Run specific command or default to login.",
                                  "enum" : [
                                  "default" : "login",
                                  "description" : "Run specific command or default to login.",
                                  "enum" : [

-                                    "upgrade",

                                     "ceph_install",
                                     "ceph_install",

-                                    "login"
+                                    "login",
+                                    "upgrade"

                                  ],
                                  "optional" : 1,
                                  "type" : "string"
                                  ],
                                  "optional" : 1,
                                  "type" : "string"


@@ -33462,9 +33569,9 @@ var pveapi = [
                                  "default" : "login",
                                  "description" : "Run specific command or default to login.",
                                  "enum" : [
                                  "default" : "login",
                                  "description" : "Run specific command or default to login.",
                                  "enum" : [

-                                    "upgrade",

                                     "ceph_install",
                                     "ceph_install",

-                                    "login"
+                                    "login",
+                                    "upgrade"

                                  ],
                                  "optional" : 1,
                                  "type" : "string"
                                  ],
                                  "optional" : 1,
                                  "type" : "string"


@@ -35021,6 +35128,73 @@ var pveapi = [
          {
             "children" : [
                {
          {
             "children" : [
                {

+                  "children" : [
+                     {
+                        "info" : {
+                           "GET" : {
+                              "description" : "Get user TFA types (Personal and Realm).",
+                              "method" : "GET",
+                              "name" : "read_user_tfa_type",
+                              "parameters" : {
+                                 "additionalProperties" : 0,
+                                 "properties" : {
+                                    "userid" : {
+                                       "description" : "User ID",
+                                       "format" : "pve-userid",
+                                       "maxLength" : 64,
+                                       "type" : "string",
+                                       "typetext" : "<string>"
+                                    }
+                                 }
+                              },
+                              "permissions" : {
+                                 "check" : [
+                                    "or",
+                                    [
+                                       "userid-param",
+                                       "self"
+                                    ],
+                                    [
+                                       "userid-group",
+                                       [
+                                          "User.Modify",
+                                          "Sys.Audit"
+                                       ]
+                                    ]
+                                 ]
+                              },
+                              "protected" : 1,
+                              "returns" : {
+                                 "additionalProperties" : 0,
+                                 "properties" : {
+                                    "realm" : {
+                                       "description" : "The type of TFA the users realm has set, if any.",
+                                       "enum" : [
+                                          "oath",
+                                          "yubico"
+                                       ],
+                                       "optional" : 1,
+                                       "type" : "string"
+                                    },
+                                    "user" : {
+                                       "description" : "The type of TFA the user has set, if any.",
+                                       "enum" : [
+                                          "oath",
+                                          "u2f"
+                                       ],
+                                       "optional" : 1,
+                                       "type" : "string"
+                                    }
+                                 },
+                                 "type" : "object"
+                              }
+                           }
+                        },
+                        "leaf" : 1,
+                        "path" : "/access/users/{userid}/tfa",
+                        "text" : "tfa"
+                     }
+                  ],

                   "info" : {
                      "DELETE" : {
                         "description" : "Delete user.",
                   "info" : {
                      "DELETE" : {
                         "description" : "Delete user.",


@@ -35212,7 +35386,7 @@ var pveapi = [
                         }
                      }
                   },
                         }
                      }
                   },

-                  "leaf" : 1,
+                  "leaf" : 0,

                   "path" : "/access/users/{userid}",
                   "text" : "{userid}"
                }
                   "path" : "/access/users/{userid}",
                   "text" : "{userid}"
                }

diff --git a/pct.1-synopsis.adoc b/pct.1-synopsis.adoc
index 2062acca8ab97be44056c9abe6fc1351e600c493..336ee6ea8836d7444ef6c7ca11ad5b4f64eb2b12 100644 (file)
--- a/pct.1-synopsis.adoc
+++ b/pct.1-synopsis.adoc
@@ -140,7 +140,7 @@ Set a host name for the container.
 
 Ignore errors when extracting the template.
 
 
 Ignore errors when extracting the template.
 

-`--lock` `<backup | disk | migrate | mounted | rollback | snapshot | snapshot-delete>` ::
+`--lock` `<backup | create | disk | fstrim | migrate | mounted | rollback | snapshot | snapshot-delete>` ::

 
 Lock/unlock the VM.
 
 
 Lock/unlock the VM.
 


@@ -560,7 +560,7 @@ Set a host name for the container.
 
 Ignore errors when extracting the template.
 
 
 Ignore errors when extracting the template.
 

-`--lock` `<backup | disk | migrate | mounted | rollback | snapshot | snapshot-delete>` ::
+`--lock` `<backup | create | disk | fstrim | migrate | mounted | rollback | snapshot | snapshot-delete>` ::

 
 Lock/unlock the VM.
 
 
 Lock/unlock the VM.
 


@@ -730,7 +730,7 @@ Script that will be exectued during various steps in the containers lifetime.
 
 Set a host name for the container.
 
 
 Set a host name for the container.
 

-`--lock` `<backup | disk | migrate | mounted | rollback | snapshot | snapshot-delete>` ::
+`--lock` `<backup | create | disk | fstrim | migrate | mounted | rollback | snapshot | snapshot-delete>` ::

 
 Lock/unlock the VM.
 
 
 Lock/unlock the VM.
 

diff --git a/pct.conf.5-opts.adoc b/pct.conf.5-opts.adoc
index a569280cacefccf68ac0e21a816d51a032fcc3bc..7fb42b724a5aa7b8dd11c2a2cfef1667075cd771 100644 (file)
--- a/pct.conf.5-opts.adoc
+++ b/pct.conf.5-opts.adoc
@@ -58,7 +58,7 @@ Script that will be exectued during various steps in the containers lifetime.
 
 Set a host name for the container.
 
 
 Set a host name for the container.
 

-`lock`: `<backup | disk | migrate | mounted | rollback | snapshot | snapshot-delete>` ::
+`lock`: `<backup | create | disk | fstrim | migrate | mounted | rollback | snapshot | snapshot-delete>` ::

 
 Lock/unlock the VM.
 
 
 Lock/unlock the VM.
 

diff --git a/qm.conf.5-opts.adoc b/qm.conf.5-opts.adoc
index 4533d64fde2dbb32adf4533bcd04104a53d8a289..704f5143167546c95bf0f27e532825983e5661a6 100644 (file)
--- a/qm.conf.5-opts.adoc
+++ b/qm.conf.5-opts.adoc
@@ -144,14 +144,14 @@ Script that will be executed during various steps in the vms lifetime.
 
 Map host PCI devices into guest.
 +
 
 Map host PCI devices into guest.
 +

-NOTE: This option allows direct access to host hardware. So it is no longer 
+NOTE: This option allows direct access to host hardware. So it is no longer

 possible to migrate such machines - use with special care.
 +
 CAUTION: Experimental! User reported problems with this option.
 
 `host`=`<HOSTPCIID[;HOSTPCIID2...]>` ;;
 
 possible to migrate such machines - use with special care.
 +
 CAUTION: Experimental! User reported problems with this option.
 
 `host`=`<HOSTPCIID[;HOSTPCIID2...]>` ;;
 

-Host PCI device pass through. The PCI ID of a host's PCI device or a list 
+Host PCI device pass through. The PCI ID of a host's PCI device or a list

 of PCI virtual functions of the host. HOSTPCIID syntax is:
 +
 'bus:dev.func' (hexadecimal numbers)
 of PCI virtual functions of the host. HOSTPCIID syntax is:
 +
 'bus:dev.func' (hexadecimal numbers)