Re: [pve-devel] [PATCH] Add possibillity to distinguish container and vm on RBD Storage.

2015-08-25 Thread Dietmar Maurer
On 08/25/2015 09:47 AM, Wolfgang Link wrote: this is necessary because we use image files for both. --- www/manager/lxc/CreateWizard.js | 2 +- www/manager/storage/RBDEdit.js | 14 ++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git

Re: [pve-devel] [PATCH 1/3] Remove mountpoint dir from vzdump backup

2015-08-25 Thread Dietmar Maurer
On 08/25/2015 01:24 PM, Wolfgang Link wrote: --- src/PVE/VZDump/LXC.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/src/PVE/VZDump/LXC.pm b/src/PVE/VZDump/LXC.pm index 112bc84..eb43807 100644 --- a/src/PVE/VZDump/LXC.pm +++ b/src/PVE/VZDump/LXC.pm @@ -277,6 +277,7 @@ sub cleanup {

Re: [pve-devel] [PATCH] Add possibillity to distinguish container and vm on RBD Storage.

2015-08-25 Thread Wolfgang Link
Yes you are right my mistake. I resend it correct. On 08/26/2015 06:13 AM, Dietmar Maurer wrote: On 08/25/2015 09:47 AM, Wolfgang Link wrote: this is necessary because we use image files for both. --- www/manager/lxc/CreateWizard.js | 2 +- www/manager/storage/RBDEdit.js | 14

Re: [pve-devel] [PATCH 1/3] Remove mountpoint dir from vzdump backup

2015-08-25 Thread Wolfgang Link
Because we have to delete a tree and not only a dir. and rmtree are the old function and shouldn't use anymore. http://perldoc.perl.org/File/Path.html On 08/26/2015 06:15 AM, Dietmar Maurer wrote: On 08/25/2015 01:24 PM, Wolfgang Link wrote: --- src/PVE/VZDump/LXC.pm | 1 + 1 file

[pve-devel] [RFC v3 pve-common] Add generic parse_host_and_port function

2015-08-25 Thread Wolfgang Bumiller
Added a generic function to split a host+port string to the host and port part supporting the two most common ipv6 notations beside domains and ipv4: with brackets for the address or a dot as port separator. --- Changes: * added missing '?' after port in 3rd variant src/PVE/Tools.pm | 13

[pve-devel] [PATCH] Add content type rootfs to RBD and extend manual

2015-08-25 Thread Wolfgang Link
--- PVE/Storage/Plugin.pm| 5 +++-- PVE/Storage/RBDPlugin.pm | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm index df02a33..96f33be 100644 --- a/PVE/Storage/Plugin.pm +++ b/PVE/Storage/Plugin.pm @@ -16,7 +16,6 @@

[pve-devel] [PATCH] Add possibillity to distinguish container and vm on RBD Storage.

2015-08-25 Thread Wolfgang Link
this is necessary because we use image files for both. --- www/manager/lxc/CreateWizard.js | 2 +- www/manager/storage/RBDEdit.js | 14 ++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/www/manager/lxc/CreateWizard.js b/www/manager/lxc/CreateWizard.js index

[pve-devel] [PATCH] Remove Java applet from list of available console viewers.

2015-08-25 Thread Emmanuel Kasper
We already did this for ExtJS4, just copying from there --- www/manager5/dc/OptionView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/manager5/dc/OptionView.js b/www/manager5/dc/OptionView.js index 043c7fd..3a98bce 100644 --- a/www/manager5/dc/OptionView.js +++

[pve-devel] [RFC v2 pve-common] Add generic parse_host_and_port function

2015-08-25 Thread Wolfgang Bumiller
Added a generic function to split a host+port string to the host and port part supporting the two most common ipv6 notations beside domains and ipv4: with brackets for the address or a dot as port separator. --- changes: less regex madness src/PVE/Tools.pm | 13 + 1 file changed,

[pve-devel] [PATCH] Pass the list of of combobox items as a property

2015-08-25 Thread Emmanuel Kasper
The original fix using a config Object was a bit overkill, this works well too , requires less code in the child classes, and is more consistent with rest of the code we have. --- www/manager5/form/KVComboBox.js | 12 ++-- www/manager5/form/LanguageSelector.js| 4 +---

[pve-devel] [PATCH pve-common] Added PVE::Network::tcp_ping to replace Net::Ping

2015-08-25 Thread Wolfgang Bumiller
We use Net::Ping twice in pve-storage (once for ISCSIPlugin and once in GlusterfsPlugin, both with the 'tcp' variant.), but Net::Ping doesn't support IPv6. --- src/PVE/Network.pm | 18 ++ 1 file changed, 18 insertions(+) diff --git a/src/PVE/Network.pm b/src/PVE/Network.pm index

[pve-devel] [PATCH 2/3] Change backup dir structure.

2015-08-25 Thread Wolfgang Link
This is necessary, because we want use ro snapshots and can't write to it. --- src/PVE/VZDump/LXC.pm | 39 --- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/src/PVE/VZDump/LXC.pm b/src/PVE/VZDump/LXC.pm index eb43807..4ee0e7c 100644 ---

[pve-devel] [PATCH 3/3] Prevent cleanup from unmount zfs subvols, if it is not a snapshot

2015-08-25 Thread Wolfgang Link
--- src/PVE/VZDump/LXC.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/PVE/VZDump/LXC.pm b/src/PVE/VZDump/LXC.pm index 4ee0e7c..12aae78 100644 --- a/src/PVE/VZDump/LXC.pm +++ b/src/PVE/VZDump/LXC.pm @@ -131,6 +131,7 @@ sub prepare { if ($scfg-{type} ne

[pve-devel] [PATCH 1/3] Remove mountpoint dir from vzdump backup

2015-08-25 Thread Wolfgang Link
--- src/PVE/VZDump/LXC.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/src/PVE/VZDump/LXC.pm b/src/PVE/VZDump/LXC.pm index 112bc84..eb43807 100644 --- a/src/PVE/VZDump/LXC.pm +++ b/src/PVE/VZDump/LXC.pm @@ -277,6 +277,7 @@ sub cleanup { # We use -d to automatically free used loop

[pve-devel] [PATCH 1/3] Refactoring code

2015-08-25 Thread Wolfgang Link
We can use this also, if we mount snapshots at backup --- src/PVE/VZDump/LXC.pm | 28 +--- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/src/PVE/VZDump/LXC.pm b/src/PVE/VZDump/LXC.pm index 12aae78..a6a0639 100644 --- a/src/PVE/VZDump/LXC.pm +++

Re: [pve-devel] [PATCH pve-common] Added PVE::Network::tcp_ping to replace Net::Ping

2015-08-25 Thread Dietmar Maurer
you should not override the global alarm timer On 08/25/2015 11:10 AM, Wolfgang Bumiller wrote: We use Net::Ping twice in pve-storage (once for ISCSIPlugin and once in GlusterfsPlugin, both with the 'tcp' variant.), but Net::Ping doesn't support IPv6. --- src/PVE/Network.pm | 18

[pve-devel] [PATCH 3/3] fix bug #691: vzdump stop backup fixed on zfs

2015-08-25 Thread Wolfgang Link
--- src/PVE/VZDump/LXC.pm | 18 -- 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/PVE/VZDump/LXC.pm b/src/PVE/VZDump/LXC.pm index cb228ca..fc3f03b 100644 --- a/src/PVE/VZDump/LXC.pm +++ b/src/PVE/VZDump/LXC.pm @@ -134,6 +134,10 @@ sub prepare { # fixme:

[pve-devel] [PATCH 2/3] fix bug #691: implement zfs vzdump snapshot backup

2015-08-25 Thread Wolfgang Link
--- src/PVE/VZDump/LXC.pm | 43 --- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/src/PVE/VZDump/LXC.pm b/src/PVE/VZDump/LXC.pm index a6a0639..cb228ca 100644 --- a/src/PVE/VZDump/LXC.pm +++ b/src/PVE/VZDump/LXC.pm @@ -66,6 +66,12 @@ sub

[pve-devel] [PATCH] Change bakup mode if storage support snapshot always use snapshot mode.

2015-08-25 Thread Wolfgang Link
--- src/PVE/LXC.pm| 8 src/PVE/VZDump/LXC.pm | 2 ++ 2 files changed, 10 insertions(+) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index d1a4ea6..5d8f701 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -1951,4 +1951,12 @@ sub mountpoint_mount { warn $@ if $@; } +sub

[pve-devel] [PATCH] allow iframe fullscreen

2015-08-25 Thread Alexandre Derumier
Signed-off-by: Alexandre Derumier aderum...@odiso.com --- www/manager/Toolkit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/manager/Toolkit.js b/www/manager/Toolkit.js index e71fb98..65be809 100644 --- a/www/manager/Toolkit.js +++ b/www/manager/Toolkit.js @@ -111,7

[pve-devel] [PATCH v2 pve-common 2/2] Added PVE::Network::tcp_ping to replace Net::Ping

2015-08-25 Thread Wolfgang Bumiller
We use Net::Ping twice in pve-storage (once for ISCSIPlugin and once in GlusterfsPlugin, both with the 'tcp' variant.), but Net::Ping doesn't support IPv6. --- src/PVE/Network.pm | 18 ++ 1 file changed, 18 insertions(+) diff --git a/src/PVE/Network.pm b/src/PVE/Network.pm index

[pve-devel] [PATCH v2 pve-common 1/2] Tools::run_with_timeout improvement + hires alarm

2015-08-25 Thread Wolfgang Bumiller
The following situations could lead to the 'unknown error': 1) As commented, when the alarm triggered after the first signal handler was installed and before the new alarm was installed. In this case the $signalcount was increased, and worse: the original signal handler was never called. 2) When

[pve-devel] [PATCH pve-container] Add handling for arch and ostype options in update_pct_config()

2015-08-25 Thread Emmanuel Kasper
Without this patch, restoring a vzdump backup fails. --- src/PVE/LXC.pm | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index d1a4ea6..05ab166 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -1090,7 +1090,8 @@ sub update_pct_config {