use "VM$vmid" like we do in a container
Signed-off-by: Dominik Csapak
---
PVE/QemuServer/Cloudinit.pm | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/PVE/QemuServer/Cloudinit.pm b/PVE/QemuServer/Cloudinit.pm
index dc55d2d..31f8462 100644
--- a/PVE/QemuServer/Clou
so that we get the hostname there
(e.g. sudo complains that it cannot resolve the hostname)
Signed-off-by: Dominik Csapak
---
PVE/QemuServer/Cloudinit.pm | 1 +
1 file changed, 1 insertion(+)
diff --git a/PVE/QemuServer/Cloudinit.pm b/PVE/QemuServer/Cloudinit.pm
index 31f8462..0e92412 100644
--
we have '$conf, $vmid' elsewhere for cloudinit, this was the only
function which had them in reverse
Signed-off-by: Dominik Csapak
---
PVE/QemuServer/Cloudinit.pm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/PVE/QemuServer/Cloudinit.pm b/PVE/QemuServer/Cloudinit.pm
i
applied
On 3/12/18 1:28 PM, Herman van Rink wrote:
> From: Herman van Rink
>
> Signed-off-by: Herman van Rink
> ---
> PVE/QemuServer.pm | 7 ---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index 628ca33..abd0713 100644
> --- a
___
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
with the following type fixes folded directly in the two affected commits:
diff --git a/debian/postinst b/debian/postinst
index 82b569e6..62ea8903 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -33,10 +33,10 @@ case "$1" in
mkdir /etc/pve 2>/dev/null || true
if dpkg --compare-ve
without this, we could not delete realms
Signed-off-by: Dominik Csapak
---
www/manager6/data/model/Realm.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/www/manager6/data/model/Realm.js b/www/manager6/data/model/Realm.js
index f4987daa..01f36351 100644
--- a/www/manager6/data/model/Realm.
we actually want to keep this for now as else we get the
autogenerated systemd helper code here which stops all services from
this package before upgrading, which we really really do not want
(kills API connections, among other things)
Signed-off-by: Thomas Lamprecht
---
debian/prerm | 41 +-
v2 of this series.
changes v1 -> v2:
* wrap transitional parts in a version dependent way, easier to know
what to remove in a future version and no need to always do this
stuff.
* do not overwrite user configured .forward's allways append ours
* fix some typos
* drop v1 15/15, we're not yet re
They all have a systemd service file so no need for them anymore
Signed-off-by: Thomas Lamprecht
---
bin/init.d/Makefile | 13 ++-
bin/init.d/pvebanner | 33
bin/init.d/pvedaemon | 49 -
bin/init.d/pveproxy | 60 -
Signed-off-by: Thomas Lamprecht
---
debian/postinst | 27 +--
1 file changed, 1 insertion(+), 26 deletions(-)
diff --git a/debian/postinst b/debian/postinst
index fca33bd5..0dc897ba 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -144,35 +144,10 @@ EOF
fi
We have the pvebanner.service in places which ensures this gets
called on boot before the getty target.
Thus this only had an effect if we changed the nodename to IP mapping
_and_ upgraded/reinstalled pve-manager, then switching to another TTY
would show the updated IP. But as this a) is for sure
With #DEBHELPER# the manual maintained code will be autogenerated, no
need to manually track which services and timers this packages has.
Signed-off-by: Thomas Lamprecht
---
debian/postrm | 34 +-
debian/rules | 2 +-
2 files changed, 2 insertions(+), 34 deletio
Signed-off-by: Thomas Lamprecht
---
debian/preinst | 32
1 file changed, 32 deletions(-)
delete mode 100644 debian/preinst
diff --git a/debian/preinst b/debian/preinst
deleted file mode 100644
index 0fe385b5..
--- a/debian/preinst
+++ /dev/null
@@ -1,32
Signed-off-by: Thomas Lamprecht
---
bin/init.d/Makefile | 2 ++
bin/init.d/pve-daily-update.service | 9 +
bin/init.d/pve-daily-update.timer | 10 ++
debian/postinst | 17 +++--
4 files changed, 24 insertions(+), 14 deletions(-)
In commit 8b89f7533e2df983e0285e2f170971a3637d7349 we needed to
change the ceph.service install target to multi-user.target, as
ceph.target could hang indefinitely if ceph-common gets upgraded.
This change is included in pve-manager 4.4-13 and newer, as users
wanting to upgrade to 5.0 must upgrade
This was used by rgmanager which was superseeded in 2015 with our
ha-manager for PVE 4.0
Signed-off-by: Thomas Lamprecht
---
bin/Makefile | 2 +-
bin/ocf/Makefile | 14 --
bin/ocf/pvevm| 599 ---
3 files changed, 1 insertion(+), 614
The first case won't happen anymore on a recent PVE.
The 'version is empty or ' check may drop the ''
part, it gets handled by the 'dpkg --compare-versions' bits just
fine, if it happens at all for the 'configure' case
Signed-off-by: Thomas Lamprecht
---
debian/postinst | 21 +---
This was added by 82f9a5d7c on 2012-02-21 11:42:32, as we had 2 major
upgrades since them every system either was update or new installed,
so just remove this.
Signed-off-by: Thomas Lamprecht
---
debian/postinst | 3 ---
1 file changed, 3 deletions(-)
diff --git a/debian/postinst b/debian/posti
Signed-off-by: Thomas Lamprecht
---
debian/config| 10 --
debian/control | 1 -
debian/postinst | 8
debian/templates | 3 ---
4 files changed, 22 deletions(-)
delete mode 100755 debian/config
delete mode 100644 debian/templates
diff --git a/debian/config b/debian/co
Signed-off-by: Thomas Lamprecht
---
debian/postinst | 2 --
1 file changed, 2 deletions(-)
diff --git a/debian/postinst b/debian/postinst
index f0002e5f..43011899 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -108,8 +108,6 @@ EOF
# rewrite banner
test -e /proxmox_install_mode |
"Note that not all init systems print messages to the system console,
so that the logfile may remain empty; this is the case with systemd
(the default init system). Try "journalctl -b" instead."
-- https://packages.debian.org/stretch/bootlogd
Signed-off-by: Thomas Lamprecht
---
debian/postinst |
Signed-off-by: Thomas Lamprecht
---
debian/postinst | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/debian/postinst b/debian/postinst
index 23355ebd..534bbc68 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -49,10 +49,11 @@ case "$1" in
rm /etc/cron.dail
Signed-off-by: Thomas Lamprecht
---
debian/postinst | 9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/debian/postinst b/debian/postinst
index 0e49eb56..fca33bd5 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -58,13 +58,8 @@ EOF
pveam update || true
f
Signed-off-by: Thomas Lamprecht
---
bin/Makefile | 15 ---
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/bin/Makefile b/bin/Makefile
index ad221d8e..c0b3f11b 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -41,21 +41,14 @@ all: ${SERVICE_MANS} ${CLI_MANS} pvemailforwa
a long overdue refactoring of our kernel build scripts and the
kernel-related has now been completed.
short summary:
- all kernel-related packages are now built using dpkg-buildpackage
- proxmox-ve got moved into its own git repository / source package
- pve-headers got renamed to pve-headers-4.1
From: Herman van Rink
Signed-off-by: Herman van Rink
---
PVE/QemuServer.pm | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 628ca33..abd0713 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3093,6 +3093,10 @@ sub co
From: Herman van Rink
In a process listing the kvm command starts with the id arugment, but only on a
fairly wide monitor will the name argument be visible.
So I propose to place the name just after the id.
Herman van Rink (1):
Move name argument to improve visibility in a process list
PVE/
applied
___
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
applied with syntax fix.
___
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
looks good, only one small sytax error:
> + # in restart mode, we start the container on the source node
> + # on migration error
> + if ($self->{opts}->{restart} && $self->{was_running}) {
> + $self->log('info', "start container on source node");
> + my skiplock = 1;
>
Signed-off-by: Wolfgang Bumiller
---
PVE/CLI/qm.pm | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/PVE/CLI/qm.pm b/PVE/CLI/qm.pm
index 3347612..c017a59 100755
--- a/PVE/CLI/qm.pm
+++ b/PVE/CLI/qm.pm
@@ -13,6 +13,7 @@ use IO::Select;
use URI::Escape;
use PVE
Instead of hardcoding 'password' as a special case in the
JSONSchema's getopt handling, extend the new parameter
mapping to allow defining a parameters as 'interactive'.
They also take an optional argument on the command line
directly.
This effectively deprecates the password special case which
sh
___
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
The multiport `--ports` parameter is an `OR` match on source
and destination ports, so we should not use it.
We also don't actually use the port count, so let the port
range parser simply return a boolean and use the counter
only for the internal check. This also fixes a regression
caused by the p
From: Fabian Grünbichler
there are basically three cases:
1) only a single or no src and dst port each
2) at least one of src or dst has more than one port, but the port
ranges are not identical
3) both src and dst have more than one port, with identical port ranges
1) can just use --dport/-
Keep the count for internal checking only and just return
whether the multiport matcher is required.
Signed-off-by: Wolfgang Bumiller
---
Changes: don't $count, we already have an array...
src/PVE/Firewall.pm | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/PVE
We can call this module also now over the API through
pvedaemon/pveproxy which have tainting checks on.
Thus we need to untaint the "read existing backups" inputs,
as else this errors out here.
Only triggers when over 10 backups existed already, so this does
not triggers really often in the real
The logic for finding out which backups to delete was a bit weird
Signed-off-by: Thomas Lamprecht
---
data/PVE/Cluster.pm | 37 +++--
1 file changed, 15 insertions(+), 22 deletions(-)
diff --git a/data/PVE/Cluster.pm b/data/PVE/Cluster.pm
index 2920ff6..27b1c97 1
___
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
Keep the count for internal checking only and just return
whether the multiport matcher is required.
Signed-off-by: Wolfgang Bumiller
---
Also fixes an undefined value usage in the new 'dport eq sport'
condition.
src/PVE/Firewall.pm | 12 +++-
1 file changed, 7 insertions(+), 5 deletion
From: Fabian Grünbichler
there are basically three cases:
1) only a single or no src and dst port each
2) at least one of src or dst has more than one port, but the port
ranges are not identical
3) both src and dst have more than one port, with identical port ranges
1) can just use --dport/-
On Sat, Mar 10, 2018 at 04:09:45PM +0100, Nils Privat wrote:
> Hello,
>
> recently i wanted to mount some directories, managed by the host, into an
> lxc.
> I opened up the "resources" -> add -> mount point:
>
> Here i was a bit confused. Is the GUI mask mixing up bind and device mounts?
> I gues
43 matches
Mail list logo
