]>
git.proxmox.com Git - pve-container.git/log
Dietmar Maurer [Sat, 15 Aug 2015 07:56:37 +0000 (09:56 +0200)]
implement new cmode option
So that the user can choose to use /dev/ttyX or /dev/console or /bin/sh.
Dietmar Maurer [Fri, 14 Aug 2015 14:33:52 +0000 (16:33 +0200)]
foreach_mountpoint: loop with defined order
Alexandre Derumier [Fri, 14 Aug 2015 12:56:45 +0000 (14:56 +0200)]
deactivate all mountpoint at ct stop
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
Alexandre Derumier [Fri, 14 Aug 2015 12:56:44 +0000 (14:56 +0200)]
activate all mountpoints at vmstart
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
Alexandre Derumier [Fri, 14 Aug 2015 12:56:43 +0000 (14:56 +0200)]
add foreach_mountpoint
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
Alexandre Derumier [Fri, 14 Aug 2015 12:56:42 +0000 (14:56 +0200)]
add mpX mountpoint config
10 mountpoint max currently (should be enough I think)
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
Dietmar Maurer [Fri, 14 Aug 2015 10:26:02 +0000 (12:26 +0200)]
refine tty hack for centos
Dietmar Maurer [Fri, 14 Aug 2015 07:20:40 +0000 (09:20 +0200)]
new helper: has_dev_console
Dietmar Maurer [Fri, 14 Aug 2015 06:50:39 +0000 (08:50 +0200)]
deny access to /dev/console if console is disabled
Dietmar Maurer [Fri, 14 Aug 2015 06:47:31 +0000 (08:47 +0200)]
set default tty count to 2
Dietmar Maurer [Fri, 14 Aug 2015 06:46:25 +0000 (08:46 +0200)]
add console option
Dietmar Maurer [Fri, 14 Aug 2015 06:17:09 +0000 (08:17 +0200)]
remove ct access permissions after destroy
Dietmar Maurer [Thu, 13 Aug 2015 17:39:56 +0000 (19:39 +0200)]
correctly compute lxc.rootfs for new subvol format
Wolfgang Bumiller [Thu, 13 Aug 2015 12:01:38 +0000 (14:01 +0200)]
print_ct_mountpoint: fix info variable substitution
Wolfgang Bumiller [Thu, 13 Aug 2015 11:52:10 +0000 (13:52 +0200)]
mountpount->mountpoint + call fix
Dietmar Maurer [Thu, 13 Aug 2015 10:31:33 +0000 (12:31 +0200)]
implement template creation
Alexandre Derumier [Wed, 12 Aug 2015 09:08:02 +0000 (11:08 +0200)]
add rbd storage type support
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
Dietmar Maurer [Wed, 12 Aug 2015 06:23:10 +0000 (08:23 +0200)]
ubuntu: generate correct init/tty<X>.conf file for upstart
Dietmar Maurer [Wed, 12 Aug 2015 05:21:12 +0000 (07:21 +0200)]
do not use hardcoded disk image names
Dietmar Maurer [Tue, 11 Aug 2015 08:23:54 +0000 (10:23 +0200)]
bump version to 0.9-10
Dietmar Maurer [Tue, 11 Aug 2015 08:21:34 +0000 (10:21 +0200)]
pve-update-lxc-config: reduce logging
Wolfgang Bumiller [Mon, 10 Aug 2015 08:07:20 +0000 (10:07 +0200)]
added pve-update-lxc-config postinstall hook
Dietmar Maurer [Tue, 11 Aug 2015 07:19:43 +0000 (09:19 +0200)]
allow to set empty lxc.xxx values
For examply, one would like to delete the seccomp profile with
lxc.seccomp =
Dietmar Maurer [Sat, 8 Aug 2015 15:17:05 +0000 (17:17 +0200)]
fix description of parameter 'rootfs'
I never commited that '<storage>:<size>' functionality.
Dietmar Maurer [Sat, 8 Aug 2015 15:11:40 +0000 (17:11 +0200)]
update README for new configuration format
Dietmar Maurer [Sat, 8 Aug 2015 10:07:41 +0000 (12:07 +0200)]
add support for RHEL/CentOS 7 (systemd console setup)
Dietmar Maurer [Sat, 8 Aug 2015 07:48:22 +0000 (09:48 +0200)]
avoid warning about undefined values
Dietmar Maurer [Fri, 7 Aug 2015 10:11:50 +0000 (12:11 +0200)]
bump version to 0.9-9
Wolfgang Link [Fri, 7 Aug 2015 09:37:17 +0000 (11:37 +0200)]
Fix: If a Ct are created and a pool are given add the Ct to pool.
Wolfgang Link [Fri, 7 Aug 2015 09:35:34 +0000 (11:35 +0200)]
Fix mem ans swap size when converted from OpenVz.
Wolfgang Link [Fri, 7 Aug 2015 07:49:52 +0000 (09:49 +0200)]
Fix in PVE::LXC parse_ct_mountpoint
there was the allocation missed
Wolfgang Link [Fri, 7 Aug 2015 07:49:51 +0000 (09:49 +0200)]
fix LXC backup after changing lxc to pct conf
Wolfgang Bumiller [Fri, 7 Aug 2015 09:20:32 +0000 (11:20 +0200)]
don't set proxy_arp and forwarding on lxc veths
Setting these doesn't make much sense as the interfaces are
attached to bridges (this is old cruft from VZ venet).
(Hotplugging already leaves them be at their default.)
Dietmar Maurer [Fri, 7 Aug 2015 09:42:46 +0000 (11:42 +0200)]
activate/deactivates volumes on container start/stop
Dietmar Maurer [Fri, 7 Aug 2015 08:31:41 +0000 (10:31 +0200)]
allow to use drbd storage for containers
Dietmar Maurer [Fri, 7 Aug 2015 07:15:59 +0000 (09:15 +0200)]
allow to add low level LXC configuration directly
Dietmar Maurer [Thu, 6 Aug 2015 14:37:51 +0000 (16:37 +0200)]
add manual page for container configuration format
Dietmar Maurer [Thu, 6 Aug 2015 14:09:17 +0000 (16:09 +0200)]
remove unused code
Wolfgang Bumiller [Thu, 6 Aug 2015 13:46:47 +0000 (15:46 +0200)]
consistent interface names and live network update
veth${vmid}.${id} looks like a vlan device, with qemu we use
tap${vmid}i${id}, so it makes sense to use an 'i' for
containers, too.
Fixed update_net to work with the new configuration method,
it still expected the old configuration hash and errored
when trying to change the network interface configuration
of a running continer.
Dietmar Maurer [Thu, 6 Aug 2015 14:02:35 +0000 (16:02 +0200)]
cleanup - remove prefix
Dietmar Maurer [Thu, 6 Aug 2015 09:50:17 +0000 (11:50 +0200)]
fix lxc.rootfs path for zfs based containers
Dietmar Maurer [Thu, 6 Aug 2015 09:28:49 +0000 (11:28 +0200)]
bump version to 0.9-8
Dietmar Maurer [Thu, 6 Aug 2015 09:12:54 +0000 (11:12 +0200)]
adopt snaptshot implementation for new config format
Dietmar Maurer [Tue, 4 Aug 2015 09:29:00 +0000 (11:29 +0200)]
use our own configuration format for containers
Dietmar Maurer [Fri, 31 Jul 2015 10:20:31 +0000 (12:20 +0200)]
bump version to 0.9-7
Wolfgang Link [Fri, 31 Jul 2015 09:47:40 +0000 (11:47 +0200)]
Fix warning if restore from OpenVZ
Wolfgang Link [Fri, 31 Jul 2015 09:47:39 +0000 (11:47 +0200)]
Fix disksize assign size when recover
Wolfgang Link [Fri, 31 Jul 2015 09:47:38 +0000 (11:47 +0200)]
Fix assign function to correct module
Dietmar Maurer [Fri, 31 Jul 2015 09:10:04 +0000 (11:10 +0200)]
bump version to 0.9-6
Wolfgang Link [Fri, 31 Jul 2015 06:25:43 +0000 (08:25 +0200)]
Remove snapshots from LXC config, when you create LXC Backup
Dietmar Maurer [Fri, 31 Jul 2015 08:25:46 +0000 (10:25 +0200)]
cleanup recover_config
Dietmar Maurer [Fri, 31 Jul 2015 07:29:55 +0000 (09:29 +0200)]
cleanup: move OpenVZ to LXC hint into convert_ovz()
Dietmar Maurer [Fri, 31 Jul 2015 07:16:35 +0000 (09:16 +0200)]
restore: do not overwrite network device names
Dietmar Maurer [Fri, 31 Jul 2015 07:09:48 +0000 (09:09 +0200)]
cleanup: use //= operator
Dietmar Maurer [Fri, 31 Jul 2015 07:01:23 +0000 (09:01 +0200)]
cleanup: remove unused code
Dietmar Maurer [Fri, 31 Jul 2015 07:00:25 +0000 (09:00 +0200)]
cleanup: new helper lxc_config_change_vmid()
Wolfgang Link [Thu, 30 Jul 2015 11:45:09 +0000 (13:45 +0200)]
Insert capability for restore LXC- and OpenVZ- dumpfiles
this patch recovers the config form the tarball.
It will nt recover the nework setting if you recover from OVZ
Wolfgang Bumiller [Thu, 30 Jul 2015 11:06:36 +0000 (13:06 +0200)]
no need to expect an auto method for ipv4
Dietmar Maurer [Thu, 30 Jul 2015 10:20:08 +0000 (12:20 +0200)]
use ./ prefix for all files inside tar archive
Wolfgang Link [Tue, 28 Jul 2015 14:05:07 +0000 (16:05 +0200)]
improve creation of LXC archive
when create a archive the container config will be the fist file in archive.
This is useful if we recover the archive.
Wolfgang Bumiller [Thu, 30 Jul 2015 08:54:01 +0000 (10:54 +0200)]
fix ipv4 replacement of running containers
While the previous strategy was enough for ipv6, ipv4 has
the concept of primary and secondary addresses (and
permanent, deprecated, ...), and so adding additional ip
addresses marked them as 'secondary'. The side effect of
this is that deleting the primary ip deletes all other ip
addresses within the same subnet. To avoid this we need to
temporarily set /proc/sys/net/ipv4/conf/promote_secondaries
to 1 before deleting the old IP address.
Wolfgang Bumiller [Thu, 30 Jul 2015 08:54:00 +0000 (10:54 +0200)]
Debian/RedHat: ipv6 slaac/autoconf support
Wolfgang Bumiller [Thu, 30 Jul 2015 08:53:59 +0000 (10:53 +0200)]
don't try to add 'dhcp' or 'auto' as ip addresses
The live ip address updating of running containers needs to
deal with dhcp and slaac settings by not trying to add these
keywords as ip addresses via the ip command.
(And fixing a typo...)
Wolfgang Bumiller [Wed, 29 Jul 2015 14:33:20 +0000 (16:33 +0200)]
fix memory and swap size calculations
memory.limit_in_bytes limits memory usage, however
memory.memsw.limit_in_bytes limits the *sum* of swap+memory
which means we cannot separately change memory and swap
in update_lxc_config as in order to keep the swap size
unchanged when changing the memory value, the "total" value
has to be recalculated.
Also fixing vmstatus' return value which only returned the
sum in maxmem and left maxswap unset, which strangely
defaults to 512 on the UI side, causing wrong numbers to be
displayed to the user.
Fixes #671
Wolfgang Bumiller [Wed, 29 Jul 2015 14:33:19 +0000 (16:33 +0200)]
Fix leftover OpenVZ call in lxc api
Dietmar Maurer [Mon, 27 Jul 2015 07:39:10 +0000 (09:39 +0200)]
bump version to 0.9-5
Thomas Lamprecht [Tue, 21 Jul 2015 08:06:53 +0000 (10:06 +0200)]
Fixed hardcoded LXC container architecture detection
Execute '/usr/bin/file -b -L /usr/bin/file' in the container to extract
architecture information. Falls back to amd64 on failure and notifies
the user. Assumes that the file command is available and we're on a x86
(32 or 64bit) linux system.
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Dietmar Maurer [Fri, 24 Jul 2015 11:12:36 +0000 (13:12 +0200)]
bump version to 0.9-4
Wolfgang Bumiller [Fri, 24 Jul 2015 07:14:58 +0000 (09:14 +0200)]
allow configuring lxc.seccomp
Wolfgang Bumiller [Fri, 24 Jul 2015 07:14:57 +0000 (09:14 +0200)]
redhat setup: dhcp, manual and unmanaged network
Redhat apparently has no single-file config option to use
dhcp for ipv4 while using static ipv6 addresses, if ipv4 and
ipv6 are both configured we add a :0 alias with the second
config. This way all combinations should work.
Wolfgang Bumiller [Fri, 24 Jul 2015 07:14:56 +0000 (09:14 +0200)]
debian setup: dhcp, manual and unmanaged network
Wolfgang Bumiller [Fri, 24 Jul 2015 07:14:55 +0000 (09:14 +0200)]
get_primary_ips: take dhcp/manual settings into account
Wolfgang Bumiller [Fri, 24 Jul 2015 07:14:54 +0000 (09:14 +0200)]
LXCSetup::Debian: style fix & removed unused vars
Wolfgang Bumiller [Fri, 24 Jul 2015 07:14:53 +0000 (09:14 +0200)]
LXC::get_primary_ips: fix ip/ip6 mixup
Dietmar Maurer [Fri, 24 Jul 2015 07:49:08 +0000 (09:49 +0200)]
parse_lxc_config: cleanup parser
snap.pve.snapname starts new isnapshot sections now (instead of empty lines)
Dietmar Maurer [Fri, 24 Jul 2015 06:32:58 +0000 (08:32 +0200)]
use check_lock with start/update/destroy
Dietmar Maurer [Fri, 24 Jul 2015 05:29:11 +0000 (07:29 +0200)]
snapshot_rollback: directly call lxc-stop
Wolfgang Link [Fri, 17 Jul 2015 07:26:51 +0000 (09:26 +0200)]
Complete the snapshot API2
Signed-off-by: Wolfgang Link <w.link@proxmox.com>
Wolfgang Link [Fri, 17 Jul 2015 07:26:50 +0000 (09:26 +0200)]
Add rollback functionality
Signed-off-by: Wolfgang Link <w.link@proxmox.com>
Wolfgang Link [Fri, 17 Jul 2015 07:26:48 +0000 (09:26 +0200)]
Add snapshot rollback to API2
Signed-off-by: Wolfgang Link <w.link@proxmox.com>
Wolfgang Link [Fri, 17 Jul 2015 07:26:47 +0000 (09:26 +0200)]
Add delsnap functionality
Signed-off-by: Wolfgang Link <w.link@proxmox.com>
Wolfgang Link [Fri, 17 Jul 2015 07:26:46 +0000 (09:26 +0200)]
Add delsnapshot to LXC API2
Signed-off-by: Wolfgang Link <w.link@proxmox.com>
Wolfgang Link [Fri, 17 Jul 2015 07:26:45 +0000 (09:26 +0200)]
Add snapshot functionality on zfs to lxc
Signed-off-by: Wolfgang Link <w.link@proxmox.com>
Wolfgang Link [Fri, 17 Jul 2015 07:26:44 +0000 (09:26 +0200)]
Add snapshot to LXC API2
Signed-off-by: Wolfgang Link <w.link@proxmox.com>
Dietmar Maurer [Thu, 23 Jul 2015 10:12:12 +0000 (12:12 +0200)]
cleanup write_lxc_config
Wolfgang Link [Fri, 17 Jul 2015 07:26:43 +0000 (09:26 +0200)]
Extend lxc config with options for snapshot
now it is possible to add sanpshots to the config.
The snapshot include all config information what are set at the snapshot.
So if you make a rolback all settings will restored
Signed-off-by: Wolfgang Link <w.link@proxmox.com>
Dietmar Maurer [Fri, 3 Jul 2015 04:41:36 +0000 (06:41 +0200)]
bump version to 0.9-3
Dietmar Maurer [Fri, 3 Jul 2015 04:35:46 +0000 (06:35 +0200)]
add test case for debian 6
Dietmar Maurer [Fri, 3 Jul 2015 04:34:10 +0000 (06:34 +0200)]
fix tty setup for debian6
Dietmar Maurer [Fri, 3 Jul 2015 04:21:15 +0000 (06:21 +0200)]
fix version parser for debian
Dietmar Maurer [Thu, 2 Jul 2015 05:49:27 +0000 (07:49 +0200)]
$change_ip_config: only pass one parameter called ipversion
Wolfgang Bumiller [Wed, 1 Jul 2015 10:58:17 +0000 (12:58 +0200)]
LXC: more compact network configuration
Deduplicated network setup code.
Using 'ip route replace' to replace or add the route.
This strategy can be rolled back safely:
1) add new ip (no harm done, old ip still exists)
2) replace route
on error:
Delete the new ip, old one is still in place.
If deleting the new ip fails, it was already modified
from within the container, so we only warn about it.
on success do (3):
3) delete old ip
New IP + gateway are in place, old IP can be deleted.
If deletion fails, we only warn like in the error case.
Dietmar Maurer [Wed, 1 Jul 2015 09:03:57 +0000 (11:03 +0200)]
bump version to 0.9-2
Dietmar Maurer [Wed, 1 Jul 2015 09:02:56 +0000 (11:02 +0200)]
correctly set password change time
Wolfgang Bumiller [Tue, 30 Jun 2015 11:47:52 +0000 (13:47 +0200)]
LXCSetup::Redhat: ipv6 config
According to their documentation both of these variables
take an IP[/prefix] notation, the gateway even has an
optional '%iface' suffix. So it should be possible to simply
take over the value content from the configuration directly.
Wolfgang Bumiller [Tue, 30 Jun 2015 11:47:51 +0000 (13:47 +0200)]
LXCSetup::Debian: ipv6 + naming consistency
Implemented the 'implement me' code and changed v4* and v6*
variable names to be consistent to the way they're named in
qemu-server: eg address and address6 vs v4address and
v6address.
Dietmar Maurer [Tue, 30 Jun 2015 08:16:21 +0000 (10:16 +0200)]
add missing }
Dietmar Maurer [Tue, 30 Jun 2015 07:17:34 +0000 (09:17 +0200)]
ip hotplug: ignore errors for del
And remove default route before we change the ip
Dietmar Maurer [Tue, 30 Jun 2015 06:03:34 +0000 (08:03 +0200)]
white space cleanups
Dietmar Maurer [Tue, 30 Jun 2015 04:48:44 +0000 (06:48 +0200)]
find_lxc_pid: cleanup regex, raise exception