]> git.proxmox.com Git - pve-container.git/commitdiff
fix issue where ttys aren't correctly set after restore
authorOguz Bektas <o.bektas@proxmox.com>
Fri, 13 Sep 2019 10:35:57 +0000 (12:35 +0200)
committerWolfgang Bumiller <w.bumiller@proxmox.com>
Tue, 17 Sep 2019 07:16:47 +0000 (09:16 +0200)
restore from unpriv to priv causes a problem with the log-in from web
console, since the /etc/securetty file isn't modified after a restore to
reflect that change (/dev/lxc/tty1 and so on).

template_fixup is normally called in post_create_hook, but we have no
$password or $ssh_keys to call the hook with during the restore. instead
we call template_fixup by itself to fix the ttys on some distributions.

Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
src/PVE/API2/LXC.pm

index 9ddaf582c5e4a11ff12ff5a0c99b770eec97f446..07280fb359fb134fbbdca14bd08748e1b1f52a14 100644 (file)
@@ -415,6 +415,8 @@ __PACKAGE__->register_method({
 
                    if ($restore) {
                        PVE::LXC::Create::restore_configuration($vmid, $rootdir, $conf, !$is_root, $unique, $skip_fw_config_restore);
+                       my $lxc_setup = PVE::LXC::Setup->new($conf, $rootdir);
+                       $lxc_setup->template_fixup($conf);
                    } else {
                        my $lxc_setup = PVE::LXC::Setup->new($conf, $rootdir); # detect OS
                        PVE::LXC::Config->write_config($vmid, $conf); # safe config (after OS detection)