Browse Source

run make update

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
master
Thomas Lamprecht 4 months ago
parent
commit
7cbed89a63
6 changed files with 188 additions and 22 deletions
  1. 164
    10
      api-viewer/apidata.js
  2. 6
    2
      pct-mountpoint-opts.adoc
  3. 6
    6
      pct.1-synopsis.adoc
  4. 10
    2
      pct.conf.5-opts.adoc
  5. 1
    1
      pveam.1-synopsis.adoc
  6. 1
    1
      pvesm.1-synopsis.adoc

+ 164
- 10
api-viewer/apidata.js View File

@@ -19914,6 +19914,13 @@ var pveapi = [
"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",
@@ -20099,6 +20106,13 @@ var pveapi = [
"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,
@@ -20359,6 +20373,13 @@ var pveapi = [
"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",
@@ -20406,7 +20427,7 @@ var pveapi = [
},
"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.",
@@ -20555,6 +20576,13 @@ var pveapi = [
"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,
@@ -20595,7 +20623,7 @@ var pveapi = [
},
"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.",
@@ -25015,6 +25043,13 @@ var pveapi = [
"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",
@@ -25062,7 +25097,7 @@ var pveapi = [
},
"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.",
@@ -25237,6 +25272,13 @@ var pveapi = [
"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,
@@ -25277,7 +25319,7 @@ var pveapi = [
},
"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.",
@@ -25472,6 +25514,55 @@ var pveapi = [
"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" : {
@@ -26322,6 +26413,69 @@ var pveapi = [
"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" : {
@@ -33708,8 +33862,8 @@ var pveapi = [
"description" : "Run specific command or default to login.",
"enum" : [
"upgrade",
"login",
"ceph_install"
"ceph_install",
"login"
],
"optional" : 1,
"type" : "string"
@@ -33802,8 +33956,8 @@ var pveapi = [
"description" : "Run specific command or default to login.",
"enum" : [
"upgrade",
"login",
"ceph_install"
"ceph_install",
"login"
],
"optional" : 1,
"type" : "string"
@@ -33925,8 +34079,8 @@ var pveapi = [
"description" : "Run specific command or default to login.",
"enum" : [
"upgrade",
"login",
"ceph_install"
"ceph_install",
"login"
],
"optional" : 1,
"type" : "string"

+ 6
- 2
pct-mountpoint-opts.adoc View File

@@ -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.

`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.

@@ -14,6 +14,10 @@ Explicitly enable or disable ACL support.

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.

+ 6
- 6
pct.1-synopsis.adoc View File

@@ -148,7 +148,7 @@ Lock/unlock the VM.

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.

@@ -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.

`--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.

@@ -568,7 +568,7 @@ Lock/unlock the VM.

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.

@@ -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.

`--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.

@@ -738,7 +738,7 @@ Lock/unlock the VM.

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.

@@ -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.

`--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.


+ 10
- 2
pct.conf.5-opts.adoc View File

@@ -66,7 +66,7 @@ Lock/unlock the VM.

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.

@@ -78,6 +78,10 @@ Explicitly enable or disable ACL support.

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.
@@ -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.

`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.

@@ -190,6 +194,10 @@ Use volume as container root.

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)

+ 1
- 1
pveam.1-synopsis.adoc View File

@@ -4,7 +4,7 @@

List available templates.

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

Restrict list to specified section.


+ 1
- 1
pvesm.1-synopsis.adoc View File

@@ -296,7 +296,7 @@ Import stream format

`<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})` ::


Loading…
Cancel
Save