]> git.proxmox.com Git - pve-container.git/commit
fix #2270: allow custom lxc options to be restored as root
authorStefan Reiter <s.reiter@proxmox.com>
Tue, 9 Jul 2019 15:20:57 +0000 (17:20 +0200)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Fri, 26 Jul 2019 06:59:30 +0000 (08:59 +0200)
commitb099c334c2602efbe50dcc24fe92d7900ee57fa3
treec3775a38cd250f9f9c5e3424363dc3a1ea9e1ac8
parentd7d109f667b28b6476cbab29f53affec61fde272
fix #2270: allow custom lxc options to be restored as root

Seems to be a regression introduced with
f360d7f16b094fa258cf82d2557d06f3284435e4 (related to #2028).
$conf->{'lxc'} would always be defined, hence we never replaced it with
the restored options.

Co-developed-by: Oguz Bektas <o.bektas@proxmox.com>
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
(cherry picked from commit 82bfeccbe6cbc12f39a04a4a8d1ac5ef12ae73ad)
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
src/PVE/LXC/Create.pm