Signed-off-by: Wolfgang Link
---
src/PVE/LXC.pm | 126 +++--
1 file changed, 123 insertions(+), 3 deletions(-)
diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
index 3bb69ca..dc351c6 100644
--- a/src/PVE/LXC.pm
+++ b/src/PVE/LXC.pm
@@ -240,7
Signed-off-by: Wolfgang Link
---
src/PVE/API2/LXC.pm | 253
1 file changed, 253 insertions(+)
diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
index 4e50b78..8d79021 100644
--- a/src/PVE/API2/LXC.pm
+++ b/src/PVE/API2/LXC.pm
@@ -410,6
Signed-off-by: Wolfgang Link
---
src/PVE/API2/LXC.pm | 43 +++
src/PVE/LXC.pm | 5 +
src/pct | 2 ++
3 files changed, 50 insertions(+)
diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
index 1c4d788..daf68ca 100644
--- a/src
Signed-off-by: Wolfgang Link
---
src/PVE/LXC.pm | 56 +++-
1 file changed, 55 insertions(+), 1 deletion(-)
diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
index f04db22..3ebb2e0 100644
--- a/src/PVE/LXC.pm
+++ b/src/PVE/LXC.pm
@@ -1616,7 +1616,61
Signed-off-by: Wolfgang Link
---
src/PVE/API2/LXC.pm | 48
src/PVE/LXC.pm | 6 ++
src/pct | 2 ++
3 files changed, 56 insertions(+)
diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
index e63b73b..1c4d788 100644
--- a
Signed-off-by: Wolfgang Link
---
www/manager/Makefile| 2 +
www/manager/Utils.js| 3 +
www/manager/lxc/Config.js | 9 +-
www/manager/lxc/Snapshot.js | 198 ++
www/manager/lxc/SnapshotTree.js | 304
Signed-off-by: Wolfgang Link
---
src/PVE/API2/LXC.pm | 98 ++---
src/PVE/LXC.pm | 104 +++-
2 files changed, 107 insertions(+), 95 deletions(-)
diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2
This patch series add the capability to make snapshots with LXC on storages who
support sanpshots.
___
pve-devel mailing list
pve-devel@pve.proxmox.com
http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
This patch series add the capability to make snapshots with LXC on storages who
support sanpshots.
___
pve-devel mailing list
pve-devel@pve.proxmox.com
http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
Signed-off-by: Wolfgang Link
---
www/manager/Makefile| 2 +
www/manager/Utils.js| 3 +
www/manager/lxc/Config.js | 9 +-
www/manager/lxc/Snapshot.js | 198 ++
www/manager/lxc/SnapshotTree.js | 304
this patch recovers the config form the tarball.
It will nt recover the nework setting if you recover from OVZ
---
src/PVE/API2/LXC.pm | 30 +++-
src/PVE/LXCCreate.pm | 102 +++---
src/PVE/VZDump/ConvertOVZ.pm | 319 +++
src/PVE/VZD
this change will provide that it will be possibel to restore LXC and OVZ
dumpfiles over the gui.
---
www/manager/storage/ContentView.js | 4 ++--
www/manager/window/Restore.js | 8
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/www/manager/storage/ContentView.js
b/w
Catch the error, if the dataset doesn't exists.
If it will not catched, you can't remove a VM.
---
PVE/Storage/ZFSPoolPlugin.pm | 3 +++
1 file changed, 3 insertions(+)
diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm
index 6b095f1..d3bb0fd 100644
--- a/PVE/Storage/ZFSPool
---
www/manager/storage/ZFSPoolEdit.js | 9 +
1 file changed, 9 insertions(+)
diff --git a/www/manager/storage/ZFSPoolEdit.js
b/www/manager/storage/ZFSPoolEdit.js
index b0a17b2..dfefa0b 100644
--- a/www/manager/storage/ZFSPoolEdit.js
+++ b/www/manager/storage/ZFSPoolEdit.js
@@ -91,6 +91,
---
www/manager/storage/ZFSPoolEdit.js | 18 +++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/www/manager/storage/ZFSPoolEdit.js
b/www/manager/storage/ZFSPoolEdit.js
index b0a17b2..9ad1284 100644
--- a/www/manager/storage/ZFSPoolEdit.js
+++ b/www/manager/storage/Z
---
www/manager/storage/ZFSPoolEdit.js | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/www/manager/storage/ZFSPoolEdit.js
b/www/manager/storage/ZFSPoolEdit.js
index dfefa0b..9ad1284 100644
--- a/www/manager/storage/ZFSPoolEdit.js
+++ b/www/manager/storage/ZFSPoolEdit.
when create a archive the container config will be the fist file in archive.
This is useful if we recover the archive.
---
src/PVE/VZDump/LXC.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/PVE/VZDump/LXC.pm b/src/PVE/VZDump/LXC.pm
index ceff324..21fb3c1 100644
--- a/src
when create a archive the container config will be the fist file in archive.
This is useful if we recover the archive.
---
PVE/VZDump/OpenVZ.pm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/PVE/VZDump/OpenVZ.pm b/PVE/VZDump/OpenVZ.pm
index 779c3a1..9fa37c7 100644
--- a/PVE
this patch recovers the config form the tarball.
It will nt recover the nework setting if you recover from OVZ
---
src/PVE/API2/LXC.pm | 30 +++-
src/PVE/LXCCreate.pm | 125 ++---
src/PVE/VZDump/ConvertOVZ.pm | 319 +++
src/PVE/
this patch recovers the config form the tarball.
It will nt recover the nework setting if you recover from OVZ
---
src/PVE/API2/LXC.pm | 30 +++-
src/PVE/LXCCreate.pm | 136 +++---
src/PVE/VZDump/ConvertOVZ.pm | 319 +++
src/PVE
---
src/PVE/VZDump/LXC.pm | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/PVE/VZDump/LXC.pm b/src/PVE/VZDump/LXC.pm
index 21fb3c1..fc74007 100644
--- a/src/PVE/VZDump/LXC.pm
+++ b/src/PVE/VZDump/LXC.pm
@@ -221,14 +221,20 @@ sub resume_vm {
sub assemble {
this patch recovers the config form the tarball.
It will nt recover the nework setting if you recover from OVZ
---
src/PVE/API2/LXC.pm | 30 +++-
src/PVE/LXCCreate.pm | 105 +++---
src/PVE/VZDump/ConvertOVZ.pm | 319 +++
src/PVE/VZD
this patch recovers the config form the tarball.
It will nt recover the nework setting if you recover from OVZ
---
src/PVE/API2/LXC.pm | 30 +++-
src/PVE/LXCCreate.pm | 105 +++---
src/PVE/VZDump/ConvertOVZ.pm | 319 +++
src/PVE/VZD
---
src/PVE/VZDump/LXC.pm | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/PVE/VZDump/LXC.pm b/src/PVE/VZDump/LXC.pm
index 21fb3c1..6fad10f 100644
--- a/src/PVE/VZDump/LXC.pm
+++ b/src/PVE/VZDump/LXC.pm
@@ -9,6 +9,7 @@ use PVE::Cluster qw(cfs_read_file);
us
---
src/PVE/VZDump/LXC.pm | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/PVE/VZDump/LXC.pm b/src/PVE/VZDump/LXC.pm
index 21fb3c1..c984abb 100644
--- a/src/PVE/VZDump/LXC.pm
+++ b/src/PVE/VZDump/LXC.pm
@@ -9,6 +9,7 @@ use PVE::Cluster qw(cfs_read_file);
use PVE
---
src/PVE/LXCCreate.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/PVE/LXCCreate.pm b/src/PVE/LXCCreate.pm
index bfb6060..ad5fcbc 100644
--- a/src/PVE/LXCCreate.pm
+++ b/src/PVE/LXCCreate.pm
@@ -304,7 +304,7 @@ sub create_rootfs {
foreach my $opt (qw(disk dige
---
src/PVE/API2/LXC.pm | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
index 4dfb582..3e4e862 100644
--- a/src/PVE/API2/LXC.pm
+++ b/src/PVE/API2/LXC.pm
@@ -278,6 +278,8 @@ __PACKAGE__->register_method({
PVE::Cluster::check_cfs_quorum(
---
src/PVE/API2/LXC.pm | 12 +---
src/PVE/LXCCreate.pm | 5 +++--
src/PVE/VZDump/ConvertOVZ.pm | 5 -
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
index 3e4e862..3bde6c1 100644
--- a/src/PVE/API2/LXC.pm
+
there where an changing in the internal name so it is necessary to adapt the
parser regex.
---
PVE/Storage/ZFSPoolPlugin.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm
index d7204b2..dbaa5ca 100644
--- a/PVE/Stora
there was the allocation missed
---
src/PVE/LXC.pm | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
index 21f03a4..bf084ba 100644
--- a/src/PVE/LXC.pm
+++ b/src/PVE/LXC.pm
@@ -643,6 +643,7 @@ sub parse_ct_mountpoint {
if ($p =~ m/^(volume|backup|size)=(.+
---
src/PVE/API2/LXC.pm | 2 +-
src/PVE/LXCCreate.pm | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
index 17cb0a6..93ab537 100644
--- a/src/PVE/API2/LXC.pm
+++ b/src/PVE/API2/LXC.pm
@@ -309,7 +309,7 @@ __PACKAGE__->register_method(
---
src/PVE/VZDump/ConvertOVZ.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/PVE/VZDump/ConvertOVZ.pm b/src/PVE/VZDump/ConvertOVZ.pm
index 72f1c0d..dedd640 100644
--- a/src/PVE/VZDump/ConvertOVZ.pm
+++ b/src/PVE/VZDump/ConvertOVZ.pm
@@ -304,9 +304,9 @@ sub convert_o
---
src/PVE/API2/LXC.pm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
index 93ab537..8823ae4 100644
--- a/src/PVE/API2/LXC.pm
+++ b/src/PVE/API2/LXC.pm
@@ -301,7 +301,7 @@ __PACKAGE__->register_method({
my $code = sub {
if the packet on the opt list is not installed, it will not shown.
---
PVE/API2/APT.pm | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/PVE/API2/APT.pm b/PVE/API2/APT.pm
index 2eac330..b665a5b 100644
--- a/PVE/API2/APT.pm
+++ b/PVE/API2/APT.pm
@@ -536,9 +536,12 @@ __PACKA
This is necessary if we use Container because they use subvol.
subvol has no size but a quota.
if return is 0 there is no quota set.
---
PVE/Storage/ZFSPoolPlugin.pm | 16
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFS
in the pvesm and pvesh we are giving the correct size of the used space from a
disk.
this change make the output of Gui and CLI consistent.
---
bin/pvestatd |5 +
www/manager/storage/StatusView.js |7 +--
2 files changed, 2 insertions(+), 10 deletions(-)
diff
in the pvesm and pvesh we are giving the correct size of the used space from a
disk.
this change make the output of Gui and CLI consistent.
---
bin/pvestatd |5 +
www/manager/storage/StatusView.js |7 +--
2 files changed, 2 insertions(+), 10 deletions(-)
diff
Yes sure we need this clean up.
On 08/17/2015 09:13 AM, Dietmar Maurer wrote:
- system("/sbin/tc filter del dev $iface parent : protocol ip prio
50 estimator 1sec 8sec >/dev/null 2>&1");
+system("/sbin/tc filter del dev $iface parent : protocol all
pref 50 u32 >/dev/null 2>&1");
---
src/PVE/HA/CRM.pm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/PVE/HA/CRM.pm b/src/PVE/HA/CRM.pm
index 9feda05..4196bba 100644
--- a/src/PVE/HA/CRM.pm
+++ b/src/PVE/HA/CRM.pm
@@ -16,7 +16,7 @@ use PVE::HA::Manager;
my $valid_states = {
wait_for_quorum => "cl
---
www/manager/ha/Fencing.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/manager/ha/Fencing.js b/www/manager/ha/Fencing.js
index f6bd365..1238fbc 100644
--- a/www/manager/ha/Fencing.js
+++ b/www/manager/ha/Fencing.js
@@ -16,7 +16,7 @@ Ext.define('PVE.ha.FencingView'
Get a understandble message,
if someone try to increase a qcow2 image where one or more snapshots reside
---
PVE/API2/Qemu.pm | 6 ++
1 file changed, 6 insertions(+)
diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 24a066f..5caaf1a 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@
---
README.dev | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/README.dev b/README.dev
index 122004a..60b8df4 100644
--- a/README.dev
+++ b/README.dev
@@ -42,7 +42,9 @@ libfile-readbackwards-perl libanyevent-perl
libanyevent-http-perl \
unzip liblocale-po-perl vlan i
---
PVE/API2/Qemu.pm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index c4516de..669cfc2 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -2171,7 +2171,8 @@ __PACKAGE__->register_method({
# do not copy snapshot r
I think we should eject it automatically instead of do not start the
machine!
This could be done easily if we check this on start.
On 08/20/2015 09:39 AM, Stefan Priebe - Profihost AG wrote:
Hi,
i've no real idea how to solve this.
Currently the following happens pretty easily.
You insert a
---
PVE/QemuServer.pm | 3 +++
1 file changed, 3 insertions(+)
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 5ba8e1c..7115007 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -4038,6 +4038,9 @@ sub try_deallocate_drive {
if $used_paths->{$path};
fan
Am 20.08.2015 um 10:33 schrieb Alexandre DERUMIER:
I think we should eject it automatically instead of do not start the
machine!
+1 for this.
Simply do an eject before migration, if the iso is local
- Mail original -
De: "Wolfgang Link"
À: "Stefan Priebe" , "pve-d
I'm wondering if it is really necessary to use krdb when lxc is on ceph?
or there are any other possibility?
There are any pitfalls with krdb?
___
pve-devel mailing list
pve-devel@pve.proxmox.com
http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-deve
this is necessary because we use snapshots and some (zfs) are read only.
---
src/PVE/VZDump/LXC.pm | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/PVE/VZDump/LXC.pm b/src/PVE/VZDump/LXC.pm
index 24f81ef..32a85db 100644
--- a/src/PVE/VZDump/LXC.pm
+++ b/src/PVE/VZDum
---
src/PVE/VZDump/LXC.pm | 19 +--
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/PVE/VZDump/LXC.pm b/src/PVE/VZDump/LXC.pm
index d415444..42c5e44 100644
--- a/src/PVE/VZDump/LXC.pm
+++ b/src/PVE/VZDump/LXC.pm
@@ -132,6 +132,10 @@ sub prepare {
# fixme: wh
---
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 cd43f98..359b5c0 100644
--- a/src/PVE/VZDump/LXC.pm
+++ b/src/PVE/VZDump/LXC.pm
@@ -307,6 +307,7 @@ sub cleanup {
# We use -d to automatically free used loop de
---
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 42c5e44..03f056c 100644
--- a/src/PVE/VZDump/LXC.pm
+++ b/src/PVE/VZDump/LXC.pm
@@ -175,6 +175,7 @@ sub prepare {
if ($scfg->{type} eq '
This Patch implement the subvol backup for snapshot and stoped mode.
Also refactoring code for reuse.
And change the way tar include the pct.conf as first file in tar archive.
___
pve-devel mailing list
pve-devel@pve.proxmox.com
http://pve.proxmox.com/
---
src/PVE/VZDump/LXC.pm | 48
1 file changed, 32 insertions(+), 16 deletions(-)
diff --git a/src/PVE/VZDump/LXC.pm b/src/PVE/VZDump/LXC.pm
index 32a85db..cd43f98 100644
--- a/src/PVE/VZDump/LXC.pm
+++ b/src/PVE/VZDump/LXC.pm
@@ -105,6 +105,13 @@
---
src/PVE/VZDump/LXC.pm | 31 +--
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/src/PVE/VZDump/LXC.pm b/src/PVE/VZDump/LXC.pm
index 359b5c0..d415444 100644
--- a/src/PVE/VZDump/LXC.pm
+++ b/src/PVE/VZDump/LXC.pm
@@ -13,6 +13,8 @@ use PVE::Tools;
u
we can use this also, if we mount snapshots
---
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 112bc84..24f81ef 100644
--- a/src/PVE/VZDump/LXC.pm
+++ b/src/PVE/VZDump/LXC.p
---
PVE/API2/APT.pm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/PVE/API2/APT.pm b/PVE/API2/APT.pm
index 1a46cf1..c6e2bda 100644
--- a/PVE/API2/APT.pm
+++ b/PVE/API2/APT.pm
@@ -537,7 +537,8 @@ __PACKAGE__->register_method({
# comment out old packages uses before 4.
---
www/manager/storage/RBDEdit.js | 17 +++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/www/manager/storage/RBDEdit.js b/www/manager/storage/RBDEdit.js
index 0170ba4..66d91bc 100644
--- a/www/manager/storage/RBDEdit.js
+++ b/www/manager/storage/RBDEdit.js
@@ -6,7
---
www/manager/lxc/CreateWizard.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/manager/lxc/CreateWizard.js b/www/manager/lxc/CreateWizard.js
index 77df991..d037316 100644
--- a/www/manager/lxc/CreateWizard.js
+++ b/www/manager/lxc/CreateWizard.js
@@ -18,7 +18,7 @@ Ext.
---
PVE/Storage/RBDPlugin.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/PVE/Storage/RBDPlugin.pm b/PVE/Storage/RBDPlugin.pm
index 9dcf420..e600ec1 100644
--- a/PVE/Storage/RBDPlugin.pm
+++ b/PVE/Storage/RBDPlugin.pm
@@ -197,7 +197,7 @@ sub type {
sub plugindata {
r
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 77df991..9
---
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 @@ cfs_register
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
--- a/src/P
---
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 'zfs'
---
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 de
---
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: whe
---
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 vm_
---
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
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
+++ b/src/PVE/VZ
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
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
this check is necessary, because we do not set ostype in qemu config when type
is other
---
PVE/QemuServer.pm | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 7115007..53fbcc9 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.
---
PVE/Storage/ZFSPlugin.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/PVE/Storage/ZFSPlugin.pm b/PVE/Storage/ZFSPlugin.pm
index 3878342..52e9090 100644
--- a/PVE/Storage/ZFSPlugin.pm
+++ b/PVE/Storage/ZFSPlugin.pm
@@ -275,7 +275,7 @@ sub alloc_image {
my $volname
e.g. datacenter.cfg is optional and produce at start of a Vm an error if it is
missing.
---
src/PVE/JSONSchema.pm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/PVE/JSONSchema.pm b/src/PVE/JSONSchema.pm
index 2837cf5..d40692f 100644
--- a/src/PVE/JSONSchema.pm
+++ b/src
this is important to avoid that all PVE nodes start the update procedure at the
same time
---
bin/Makefile| 5 ++-
bin/cron/Makefile | 6 ---
bin/cron/daily/Makefile | 15 ---
bin/cron/daily/pve | 101
bin/pveupdate
---
src/PVE/LXC.pm | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
index eb69fac..357fc81 100644
--- a/src/PVE/LXC.pm
+++ b/src/PVE/LXC.pm
@@ -1912,6 +1912,12 @@ sub dettach_loops {
}
}
+sub is_mounted {
+my ($mountpoint) = @_
It is not really necessary to use the lock at migragtion.
And it makes problem to remove the lock, because the config is moved
and the cluster_vm list is not updated at this moment.
---
src/PVE/LXC/Migrate.pm | 23 +++
1 file changed, 15 insertions(+), 8 deletions(-)
diff --gi
> Dietmar Maurer hat am 2. September 2015 um 18:40
> geschrieben:
>
>
> I would like to avoid running external programs for that.
> Please can you try to use somethgink like:
>
> PVE::Storage::NFSPlugin::read_proc_mounts()
>
You mean a case differentiation for every storage type?
> Maybe we
we can reuse this function in other parts of the code.
___
pve-devel mailing list
pve-devel@pve.proxmox.com
http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
---
src/PVE/Tools.pm | 14 ++
1 file changed, 14 insertions(+)
diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm
index 577a8bc..4f7efd1 100644
--- a/src/PVE/Tools.pm
+++ b/src/PVE/Tools.pm
@@ -39,6 +39,7 @@ template_replace
safe_print
trim
extract_param
+read_proc_mounts
);
my $
---
src/PVE/Tools.pm | 13 +
1 file changed, 13 insertions(+)
diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm
index 4f7efd1..42318ce 100644
--- a/src/PVE/Tools.pm
+++ b/src/PVE/Tools.pm
@@ -40,6 +40,7 @@ safe_print
trim
extract_param
read_proc_mounts
+is_mounted
);
my $pvelogd
this function will be uesd in more path of the code.
---
PVE/Storage/NFSPlugin.pm | 15 +--
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/PVE/Storage/NFSPlugin.pm b/PVE/Storage/NFSPlugin.pm
index 68764b7..5ba6701 100644
--- a/PVE/Storage/NFSPlugin.pm
+++ b/PVE/Storage/N
It is not really necessary to use the lock at migragtion.
And it makes problem to remove the lock, because the config is moved
and the cluster_vm list is not updated at this moment.
---
src/PVE/LXC/Migrate.pm | 23 +++
1 file changed, 15 insertions(+), 8 deletions(-)
diff --gi
this is neccessay because otherwise when a storage is not mounted, like when it
is offline, the migration crash.
---
src/PVE/LXC.pm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
index 1c9c1a5..7de3975 100644
--- a/src/PVE/LXC.pm
+++ b/src
This is necessary to avoid a migration crash.
it happent at the offlie migration when we try to unmount a non mounted storage.
___
pve-devel mailing list
pve-devel@pve.proxmox.com
http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
activating the disk when use RBD is necessary to have the given path.
---
PVE/QemuServer.pm | 2 ++
1 file changed, 2 insertions(+)
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index be53a1e..42be37b 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -6276,6 +6276,8 @@ sub clone_disk
---
proxmox-ve/postinst | 6 ++
1 file changed, 6 insertions(+)
diff --git a/proxmox-ve/postinst b/proxmox-ve/postinst
index be375d2..74dca77 100755
--- a/proxmox-ve/postinst
+++ b/proxmox-ve/postinst
@@ -20,6 +20,12 @@ case "$1" in
echo -n "installing proxmox release key: "
/usr/bi
---
proxmox-ve/postinst | 6 ++
1 file changed, 6 insertions(+)
diff --git a/proxmox-ve/postinst b/proxmox-ve/postinst
index be375d2..461f8cb 100755
--- a/proxmox-ve/postinst
+++ b/proxmox-ve/postinst
@@ -20,6 +20,12 @@ case "$1" in
echo -n "installing proxmox release key: "
/usr/bi
---
src/PVE/CLI/pct.pm | 27 +++
1 file changed, 27 insertions(+)
diff --git a/src/PVE/CLI/pct.pm b/src/PVE/CLI/pct.pm
index a9f7716..c24600e 100755
--- a/src/PVE/CLI/pct.pm
+++ b/src/PVE/CLI/pct.pm
@@ -28,6 +28,32 @@ my $upid_exit = sub {
};
__PACKAGE__->register_meth
This is necessary to avoid a migration crash.
it happent at the offlie migration when we try to unmount a non mounted storage.
___
pve-devel mailing list
pve-devel@pve.proxmox.com
http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
this will handle if the migration was successful or not.
this is important, because this determines where the config is.
---
src/PVE/LXC/Migrate.pm | 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/PVE/LXC/Migrate.pm b/src/PVE/LXC/Migrate.pm
index bf6d701..
this is neccessay because otherwise when a storage is not mounted, like when it
is offline, the migration crash.
---
src/PVE/LXC.pm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
index cf45fff..7e5cc7d 100644
--- a/src/PVE/LXC.pm
+++ b/src/P
We change currently the the ceph repository, so we are able to install ceph on
PVE4.0 Beta2.
---
bin/pveceph | 27 ---
1 file changed, 24 insertions(+), 3 deletions(-)
diff --git a/bin/pveceph b/bin/pveceph
index 227eaa1..aefeee0 100755
--- a/bin/pveceph
+++ b/bin/pveceph
Yes, that's true.
Thanks!
On 09/04/2015 02:05 PM, Philipp Marek wrote:
this is neccessay because otherwise when a storage is not mounted, like when it
is offline, the migration crash.
---
src/PVE/LXC.pm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/PVE/LXC.pm b/s
this is neccessay because otherwise when a storage is not mounted, like when it
is offline, the migration crash.
---
src/PVE/LXC.pm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
index cf45fff..47c141f 100644
--- a/src/PVE/LXC.pm
+++ b/src/P
---
Makefile | 1 +
debian/conffiles | 1 +
pve-blacklist.conf | 4
3 files changed, 6 insertions(+)
create mode 100644 pve-blacklist.conf
diff --git a/Makefile b/Makefile
index ee9f3b2..e5f9017 100644
--- a/Makefile
+++ b/Makefile
@@ -93,6 +93,7 @@ install: country.dat vznet.co
This fix is essential of cause json field changes in the ceph api.
They change the field size in pool to max_avail
and the field total_size in stats to total_max_avail
---
PVE/API2/Ceph.pm | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/PVE/API2/Ceph.pm b/PVE/API2/Ceph.
this is necessary to pervent aa error by trying to remove a mapped volume.
---
PVE/Storage/RBDPlugin.pm | 4
1 file changed, 4 insertions(+)
diff --git a/PVE/Storage/RBDPlugin.pm b/PVE/Storage/RBDPlugin.pm
index 329fd23..feb8bfc 100644
--- a/PVE/Storage/RBDPlugin.pm
+++ b/PVE/Storage/RBDPlug
---
PVE/QemuServer.pm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index fedb58e..50b3dd6 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -5881,7 +5881,8 @@ sub do_snapshots_with_qemu {
my $storage_name = PVE::Storage:
This two fixes make it possible to use krbd mode for Qemu.
___
pve-devel mailing list
pve-devel@pve.proxmox.com
http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
---
www/manager/storage/RBDEdit.js | 6 ++
1 file changed, 6 insertions(+)
diff --git a/www/manager/storage/RBDEdit.js b/www/manager/storage/RBDEdit.js
index 8f1abf2..d36c426 100644
--- a/www/manager/storage/RBDEdit.js
+++ b/www/manager/storage/RBDEdit.js
@@ -74,6 +74,12 @@ Ext.define('PVE.st
701 - 800 of 1022 matches
Mail list logo