run make update

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

diff --git a/api-viewer/apidata.js b/api-viewer/apidata.js
index befa5898df789aa3e9c6ce179e64875985c44623..73c116e69fcef1717609c02f46118ffe822deff8 100644 (file)
--- a/api-viewer/apidata.js
+++ b/api-viewer/apidata.js
@@ -19914,6 +19914,13 @@ var pveapi = [
                                                    "type" : "boolean",
                                                    "verbose_description" : "Whether to include the mount point in backups (only used for volume mount points)."
                                                 },
                                                    "type" : "boolean",
                                                    "verbose_description" : "Whether to include the mount point in backups (only used for volume mount points)."
                                                 },

+                                                "mountoptions" : {
+                                                   "description" : "Extra mount options for rootfs/mps.",
+                                                   "format_description" : "opt[;opt...]",
+                                                   "optional" : 1,
+                                                   "pattern" : "(?^:(?^:(noatime|nodev|nosuid|noexec))(;(?^:(noatime|nodev|nosuid|noexec)))*)",
+                                                   "type" : "string"
+                                                },

                                                 "mp" : {
                                                    "description" : "Path to the mount point as seen from inside the container (must not contain symlinks).",
                                                    "format" : "pve-lxc-mp-string",
                                                 "mp" : {
                                                    "description" : "Path to the mount point as seen from inside the container (must not contain symlinks).",
                                                    "format" : "pve-lxc-mp-string",


@@ -20099,6 +20106,13 @@ var pveapi = [
                                                    "optional" : 1,
                                                    "type" : "boolean"
                                                 },
                                                    "optional" : 1,
                                                    "type" : "boolean"
                                                 },

+                                                "mountoptions" : {
+                                                   "description" : "Extra mount options for rootfs/mps.",
+                                                   "format_description" : "opt[;opt...]",
+                                                   "optional" : 1,
+                                                   "pattern" : "(?^:(?^:(noatime|nodev|nosuid|noexec))(;(?^:(noatime|nodev|nosuid|noexec)))*)",
+                                                   "type" : "string"
+                                                },

                                                 "quota" : {
                                                    "description" : "Enable user quotas inside the container (not supported with zfs subvolumes)",
                                                    "optional" : 1,
                                                 "quota" : {
                                                    "description" : "Enable user quotas inside the container (not supported with zfs subvolumes)",
                                                    "optional" : 1,


@@ -20359,6 +20373,13 @@ var pveapi = [
                                                    "type" : "boolean",
                                                    "verbose_description" : "Whether to include the mount point in backups (only used for volume mount points)."
                                                 },
                                                    "type" : "boolean",
                                                    "verbose_description" : "Whether to include the mount point in backups (only used for volume mount points)."
                                                 },

+                                                "mountoptions" : {
+                                                   "description" : "Extra mount options for rootfs/mps.",
+                                                   "format_description" : "opt[;opt...]",
+                                                   "optional" : 1,
+                                                   "pattern" : "(?^:(?^:(noatime|nodev|nosuid|noexec))(;(?^:(noatime|nodev|nosuid|noexec)))*)",
+                                                   "type" : "string"
+                                                },

                                                 "mp" : {
                                                    "description" : "Path to the mount point as seen from inside the container (must not contain symlinks).",
                                                    "format" : "pve-lxc-mp-string",
                                                 "mp" : {
                                                    "description" : "Path to the mount point as seen from inside the container (must not contain symlinks).",
                                                    "format" : "pve-lxc-mp-string",


@@ -20406,7 +20427,7 @@ var pveapi = [
                                              },
                                              "optional" : 1,
                                              "type" : "string",
                                              },
                                              "optional" : 1,
                                              "type" : "string",

-                                             "typetext" : "[volume=]<volume> ,mp=<Path> [,acl=<1|0>] [,backup=<1|0>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]"
+                                             "typetext" : "[volume=]<volume> ,mp=<Path> [,acl=<1|0>] [,backup=<1|0>] [,mountoptions=<opt[;opt...]>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]"

                                           },
                                           "nameserver" : {
                                              "description" : "Sets DNS server IP address for a container. Create will automatically use the setting from the host if you neither set searchdomain nor nameserver.",
                                           },
                                           "nameserver" : {
                                              "description" : "Sets DNS server IP address for a container. Create will automatically use the setting from the host if you neither set searchdomain nor nameserver.",


@@ -20555,6 +20576,13 @@ var pveapi = [
                                                    "optional" : 1,
                                                    "type" : "boolean"
                                                 },
                                                    "optional" : 1,
                                                    "type" : "boolean"
                                                 },

+                                                "mountoptions" : {
+                                                   "description" : "Extra mount options for rootfs/mps.",
+                                                   "format_description" : "opt[;opt...]",
+                                                   "optional" : 1,
+                                                   "pattern" : "(?^:(?^:(noatime|nodev|nosuid|noexec))(;(?^:(noatime|nodev|nosuid|noexec)))*)",
+                                                   "type" : "string"
+                                                },

                                                 "quota" : {
                                                    "description" : "Enable user quotas inside the container (not supported with zfs subvolumes)",
                                                    "optional" : 1,
                                                 "quota" : {
                                                    "description" : "Enable user quotas inside the container (not supported with zfs subvolumes)",
                                                    "optional" : 1,


@@ -20595,7 +20623,7 @@ var pveapi = [
                                              },
                                              "optional" : 1,
                                              "type" : "string",
                                              },
                                              "optional" : 1,
                                              "type" : "string",

-                                             "typetext" : "[volume=]<volume> [,acl=<1|0>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]"
+                                             "typetext" : "[volume=]<volume> [,acl=<1|0>] [,mountoptions=<opt[;opt...]>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]"

                                           },
                                           "searchdomain" : {
                                              "description" : "Sets DNS search domains for a container. Create will automatically use the setting from the host if you neither set searchdomain nor nameserver.",
                                           },
                                           "searchdomain" : {
                                              "description" : "Sets DNS search domains for a container. Create will automatically use the setting from the host if you neither set searchdomain nor nameserver.",


@@ -25015,6 +25043,13 @@ var pveapi = [
                                        "type" : "boolean",
                                        "verbose_description" : "Whether to include the mount point in backups (only used for volume mount points)."
                                     },
                                        "type" : "boolean",
                                        "verbose_description" : "Whether to include the mount point in backups (only used for volume mount points)."
                                     },

+                                    "mountoptions" : {
+                                       "description" : "Extra mount options for rootfs/mps.",
+                                       "format_description" : "opt[;opt...]",
+                                       "optional" : 1,
+                                       "pattern" : "(?^:(?^:(noatime|nodev|nosuid|noexec))(;(?^:(noatime|nodev|nosuid|noexec)))*)",
+                                       "type" : "string"
+                                    },

                                     "mp" : {
                                        "description" : "Path to the mount point as seen from inside the container (must not contain symlinks).",
                                        "format" : "pve-lxc-mp-string",
                                     "mp" : {
                                        "description" : "Path to the mount point as seen from inside the container (must not contain symlinks).",
                                        "format" : "pve-lxc-mp-string",


@@ -25062,7 +25097,7 @@ var pveapi = [
                                  },
                                  "optional" : 1,
                                  "type" : "string",
                                  },
                                  "optional" : 1,
                                  "type" : "string",

-                                 "typetext" : "[volume=]<volume> ,mp=<Path> [,acl=<1|0>] [,backup=<1|0>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]"
+                                 "typetext" : "[volume=]<volume> ,mp=<Path> [,acl=<1|0>] [,backup=<1|0>] [,mountoptions=<opt[;opt...]>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]"

                               },
                               "nameserver" : {
                                  "description" : "Sets DNS server IP address for a container. Create will automatically use the setting from the host if you neither set searchdomain nor nameserver.",
                               },
                               "nameserver" : {
                                  "description" : "Sets DNS server IP address for a container. Create will automatically use the setting from the host if you neither set searchdomain nor nameserver.",


@@ -25237,6 +25272,13 @@ var pveapi = [
                                        "optional" : 1,
                                        "type" : "boolean"
                                     },
                                        "optional" : 1,
                                        "type" : "boolean"
                                     },

+                                    "mountoptions" : {
+                                       "description" : "Extra mount options for rootfs/mps.",
+                                       "format_description" : "opt[;opt...]",
+                                       "optional" : 1,
+                                       "pattern" : "(?^:(?^:(noatime|nodev|nosuid|noexec))(;(?^:(noatime|nodev|nosuid|noexec)))*)",
+                                       "type" : "string"
+                                    },

                                     "quota" : {
                                        "description" : "Enable user quotas inside the container (not supported with zfs subvolumes)",
                                        "optional" : 1,
                                     "quota" : {
                                        "description" : "Enable user quotas inside the container (not supported with zfs subvolumes)",
                                        "optional" : 1,


@@ -25277,7 +25319,7 @@ var pveapi = [
                                  },
                                  "optional" : 1,
                                  "type" : "string",
                                  },
                                  "optional" : 1,
                                  "type" : "string",

-                                 "typetext" : "[volume=]<volume> [,acl=<1|0>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]"
+                                 "typetext" : "[volume=]<volume> [,acl=<1|0>] [,mountoptions=<opt[;opt...]>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]"

                               },
                               "searchdomain" : {
                                  "description" : "Sets DNS search domains for a container. Create will automatically use the setting from the host if you neither set searchdomain nor nameserver.",
                               },
                               "searchdomain" : {
                                  "description" : "Sets DNS search domains for a container. Create will automatically use the setting from the host if you neither set searchdomain nor nameserver.",


@@ -25472,6 +25514,55 @@ var pveapi = [
                                     "leaf" : 1,
                                     "path" : "/nodes/{node}/ceph/osd/{osdid}/out",
                                     "text" : "out"
                                     "leaf" : 1,
                                     "path" : "/nodes/{node}/ceph/osd/{osdid}/out",
                                     "text" : "out"

+                                 },
+                                 {
+                                    "info" : {
+                                       "POST" : {
+                                          "description" : "Instruct the OSD to scrub.",
+                                          "method" : "POST",
+                                          "name" : "scrub",
+                                          "parameters" : {
+                                             "additionalProperties" : 0,
+                                             "properties" : {
+                                                "deep" : {
+                                                   "default" : 0,
+                                                   "description" : "If set, instructs a deep scrub instead of a normal one.",
+                                                   "optional" : 1,
+                                                   "type" : "boolean",
+                                                   "typetext" : "<boolean>"
+                                                },
+                                                "node" : {
+                                                   "description" : "The cluster node name.",
+                                                   "format" : "pve-node",
+                                                   "type" : "string",
+                                                   "typetext" : "<string>"
+                                                },
+                                                "osdid" : {
+                                                   "description" : "OSD ID",
+                                                   "type" : "integer",
+                                                   "typetext" : "<integer>"
+                                                }
+                                             }
+                                          },
+                                          "permissions" : {
+                                             "check" : [
+                                                "perm",
+                                                "/",
+                                                [
+                                                   "Sys.Modify"
+                                                ]
+                                             ]
+                                          },
+                                          "protected" : 1,
+                                          "proxyto" : "node",
+                                          "returns" : {
+                                             "type" : "null"
+                                          }
+                                       }
+                                    },
+                                    "leaf" : 1,
+                                    "path" : "/nodes/{node}/ceph/osd/{osdid}/scrub",
+                                    "text" : "scrub"

                                  }
                               ],
                               "info" : {
                                  }
                               ],
                               "info" : {


@@ -26322,6 +26413,69 @@ var pveapi = [
                         "path" : "/nodes/{node}/ceph/config",
                         "text" : "config"
                      },
                         "path" : "/nodes/{node}/ceph/config",
                         "text" : "config"
                      },

+                     {
+                        "info" : {
+                           "GET" : {
+                              "description" : "Get Ceph configuration database.",
+                              "method" : "GET",
+                              "name" : "configdb",
+                              "parameters" : {
+                                 "additionalProperties" : 0,
+                                 "properties" : {
+                                    "node" : {
+                                       "description" : "The cluster node name.",
+                                       "format" : "pve-node",
+                                       "type" : "string",
+                                       "typetext" : "<string>"
+                                    }
+                                 }
+                              },
+                              "permissions" : {
+                                 "check" : [
+                                    "perm",
+                                    "/",
+                                    [
+                                       "Sys.Audit",
+                                       "Datastore.Audit"
+                                    ],
+                                    "any",
+                                    1
+                                 ]
+                              },
+                              "protected" : 1,
+                              "proxyto" : "node",
+                              "returns" : {
+                                 "items" : {
+                                    "properties" : {
+                                       "can_update_at_runtime" : {
+                                          "type" : "boolean"
+                                       },
+                                       "level" : {
+                                          "type" : "string"
+                                       },
+                                       "mask" : {
+                                          "type" : "string"
+                                       },
+                                       "name" : {
+                                          "type" : "string"
+                                       },
+                                       "section" : {
+                                          "type" : "string"
+                                       },
+                                       "value" : {
+                                          "type" : "string"
+                                       }
+                                    },
+                                    "type" : "object"
+                                 },
+                                 "type" : "array"
+                              }
+                           }
+                        },
+                        "leaf" : 1,
+                        "path" : "/nodes/{node}/ceph/configdb",
+                        "text" : "configdb"
+                     },

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


@@ -33708,8 +33862,8 @@ var pveapi = [
                                  "description" : "Run specific command or default to login.",
                                  "enum" : [
                                     "upgrade",
                                  "description" : "Run specific command or default to login.",
                                  "enum" : [
                                     "upgrade",

-                                    "login",
-                                    "ceph_install"
+                                    "ceph_install",
+                                    "login"

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


@@ -33802,8 +33956,8 @@ var pveapi = [
                                  "description" : "Run specific command or default to login.",
                                  "enum" : [
                                     "upgrade",
                                  "description" : "Run specific command or default to login.",
                                  "enum" : [
                                     "upgrade",

-                                    "login",
-                                    "ceph_install"
+                                    "ceph_install",
+                                    "login"

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


@@ -33925,8 +34079,8 @@ var pveapi = [
                                  "description" : "Run specific command or default to login.",
                                  "enum" : [
                                     "upgrade",
                                  "description" : "Run specific command or default to login.",
                                  "enum" : [
                                     "upgrade",

-                                    "login",
-                                    "ceph_install"
+                                    "ceph_install",
+                                    "login"

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

diff --git a/pct-mountpoint-opts.adoc b/pct-mountpoint-opts.adoc
index 203b9f338ebc9d84a165d307da79cb517f848471..a12ff7080a0a74aff32bd9bf1fa93ea77551e30b 100644 (file)
--- a/pct-mountpoint-opts.adoc
+++ b/pct-mountpoint-opts.adoc
@@ -1,8 +1,8 @@
-`rootfs`: `[volume=]<volume> [,acl=<1|0>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::
+`rootfs`: `[volume=]<volume> [,acl=<1|0>] [,mountoptions=<opt[;opt...]>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::

 
 Use volume as container root. See below for a detailed description of all options.
 
 
 Use volume as container root. See below for a detailed description of all options.
 

-`mp[n]`: `[volume=]<volume> ,mp=<Path> [,acl=<1|0>] [,backup=<1|0>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::
+`mp[n]`: `[volume=]<volume> ,mp=<Path> [,acl=<1|0>] [,backup=<1|0>] [,mountoptions=<opt[;opt...]>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::

 
 Use volume as container mount point.
 
 
 Use volume as container mount point.
 


@@ -14,6 +14,10 @@ Explicitly enable or disable ACL support.
 
 Whether to include the mount point in backups (only used for volume mount points).
 
 
 Whether to include the mount point in backups (only used for volume mount points).
 

+`mountoptions`=`<opt[;opt...]>` ;;
+
+Extra mount options for rootfs/mps.
+

 `mp`=`<Path>` ;;
 
 Path to the mount point as seen from inside the container.
 `mp`=`<Path>` ;;
 
 Path to the mount point as seen from inside the container.

diff --git a/pct.1-synopsis.adoc b/pct.1-synopsis.adoc
index 336ee6ea8836d7444ef6c7ca11ad5b4f64eb2b12..e4ebec4891e6e61c2456a1468a38f13e6dd8dd32 100644 (file)
--- a/pct.1-synopsis.adoc
+++ b/pct.1-synopsis.adoc
@@ -148,7 +148,7 @@ Lock/unlock the VM.
 
 Amount of RAM for the VM in MB.
 
 
 Amount of RAM for the VM in MB.
 

-`--mp[n]` `[volume=]<volume> ,mp=<Path> [,acl=<1|0>] [,backup=<1|0>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::
+`--mp[n]` `[volume=]<volume> ,mp=<Path> [,acl=<1|0>] [,backup=<1|0>] [,mountoptions=<opt[;opt...]>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::

 
 Use volume as container mount point.
 
 
 Use volume as container mount point.
 


@@ -184,7 +184,7 @@ Sets the protection flag of the container. This will prevent the CT or CT's disk
 
 Mark this as restore task.
 
 
 Mark this as restore task.
 

-`--rootfs` `[volume=]<volume> [,acl=<1|0>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::
+`--rootfs` `[volume=]<volume> [,acl=<1|0>] [,mountoptions=<opt[;opt...]>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::

 
 Use volume as container root.
 
 
 Use volume as container root.
 


@@ -568,7 +568,7 @@ Lock/unlock the VM.
 
 Amount of RAM for the VM in MB.
 
 
 Amount of RAM for the VM in MB.
 

-`--mp[n]` `[volume=]<volume> ,mp=<Path> [,acl=<1|0>] [,backup=<1|0>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::
+`--mp[n]` `[volume=]<volume> ,mp=<Path> [,acl=<1|0>] [,backup=<1|0>] [,mountoptions=<opt[;opt...]>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::

 
 Use volume as container mount point.
 
 
 Use volume as container mount point.
 


@@ -600,7 +600,7 @@ Add the VM to the specified pool.
 
 Sets the protection flag of the container. This will prevent the CT or CT's disk remove/update operation.
 
 
 Sets the protection flag of the container. This will prevent the CT or CT's disk remove/update operation.
 

-`--rootfs` `[volume=]<volume> [,acl=<1|0>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::
+`--rootfs` `[volume=]<volume> [,acl=<1|0>] [,mountoptions=<opt[;opt...]>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::

 
 Use volume as container root.
 
 
 Use volume as container root.
 


@@ -738,7 +738,7 @@ Lock/unlock the VM.
 
 Amount of RAM for the VM in MB.
 
 
 Amount of RAM for the VM in MB.
 

-`--mp[n]` `[volume=]<volume> ,mp=<Path> [,acl=<1|0>] [,backup=<1|0>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::
+`--mp[n]` `[volume=]<volume> ,mp=<Path> [,acl=<1|0>] [,backup=<1|0>] [,mountoptions=<opt[;opt...]>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::

 
 Use volume as container mount point.
 
 
 Use volume as container mount point.
 


@@ -762,7 +762,7 @@ OS type. This is used to setup configuration inside the container, and correspon
 
 Sets the protection flag of the container. This will prevent the CT or CT's disk remove/update operation.
 
 
 Sets the protection flag of the container. This will prevent the CT or CT's disk remove/update operation.
 

-`--rootfs` `[volume=]<volume> [,acl=<1|0>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::
+`--rootfs` `[volume=]<volume> [,acl=<1|0>] [,mountoptions=<opt[;opt...]>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::

 
 Use volume as container root.
 
 
 Use volume as container root.
 

diff --git a/pct.conf.5-opts.adoc b/pct.conf.5-opts.adoc
index 7fb42b724a5aa7b8dd11c2a2cfef1667075cd771..a1be9e77d5b8da58568f77220c5b544835902d0c 100644 (file)
--- a/pct.conf.5-opts.adoc
+++ b/pct.conf.5-opts.adoc
@@ -66,7 +66,7 @@ Lock/unlock the VM.
 
 Amount of RAM for the VM in MB.
 
 
 Amount of RAM for the VM in MB.
 

-`mp[n]`: `[volume=]<volume> ,mp=<Path> [,acl=<1|0>] [,backup=<1|0>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::
+`mp[n]`: `[volume=]<volume> ,mp=<Path> [,acl=<1|0>] [,backup=<1|0>] [,mountoptions=<opt[;opt...]>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::

 
 Use volume as container mount point.
 
 
 Use volume as container mount point.
 


@@ -78,6 +78,10 @@ Explicitly enable or disable ACL support.
 
 Whether to include the mount point in backups (only used for volume mount points).
 
 
 Whether to include the mount point in backups (only used for volume mount points).
 

+`mountoptions`=`<opt[;opt...]>` ;;
+
+Extra mount options for rootfs/mps.
+

 `mp`=`<Path>` ;;
 
 Path to the mount point as seen from inside the container.
 `mp`=`<Path>` ;;
 
 Path to the mount point as seen from inside the container.


@@ -182,7 +186,7 @@ OS type. This is used to setup configuration inside the container, and correspon
 
 Sets the protection flag of the container. This will prevent the CT or CT's disk remove/update operation.
 
 
 Sets the protection flag of the container. This will prevent the CT or CT's disk remove/update operation.
 

-`rootfs`: `[volume=]<volume> [,acl=<1|0>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::
+`rootfs`: `[volume=]<volume> [,acl=<1|0>] [,mountoptions=<opt[;opt...]>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::

 
 Use volume as container root.
 
 
 Use volume as container root.
 


@@ -190,6 +194,10 @@ Use volume as container root.
 
 Explicitly enable or disable ACL support.
 
 
 Explicitly enable or disable ACL support.
 

+`mountoptions`=`<opt[;opt...]>` ;;
+
+Extra mount options for rootfs/mps.
+

 `quota`=`<boolean>` ;;
 
 Enable user quotas inside the container (not supported with zfs subvolumes)
 `quota`=`<boolean>` ;;
 
 Enable user quotas inside the container (not supported with zfs subvolumes)

diff --git a/pveam.1-synopsis.adoc b/pveam.1-synopsis.adoc
index c1456ca81c8ea8d8bd509ffcc2546910c5869223..feab46526f7c85f97eb4b3ad1a7dcf04140d294a 100644 (file)
--- a/pveam.1-synopsis.adoc
+++ b/pveam.1-synopsis.adoc
@@ -4,7 +4,7 @@
 
 List available templates.
 
 
 List available templates.
 

-`--section` `<system | turnkeylinux>` ::
+`--section` `<mail | system | turnkeylinux>` ::

 
 Restrict list to specified section.
 
 
 Restrict list to specified section.
 

diff --git a/pvesm.1-synopsis.adoc b/pvesm.1-synopsis.adoc
index c7d427108771e42564afa35f3479a593eb3aa9ec..9e2f16eb8f45c657d618f58fdb0b3da1035832d5 100644 (file)
--- a/pvesm.1-synopsis.adoc
+++ b/pvesm.1-synopsis.adoc
@@ -296,7 +296,7 @@ Import stream format
 
 `<filename>`: `<string>` ::
 
 
 `<filename>`: `<string>` ::
 

-Source file name
+Source file name. For '-' stdin is used, the tcp://<IP-or-CIDR> format allows to use a TCP connection as input. Else, the file is treated as common file.

 
 `--base` `(?^:[a-z0-9_\-]{1,40})` ::
 
 
 `--base` `(?^:[a-z0-9_\-]{1,40})` ::