This should allow vanilla lxc templates to work without the
double-console issue by removing their getty@.service
replacement. (Since we instead fixup
container-getty@.service)
---
Changes to the second patch of the previous series:
* unlink lxc's getty@.service replacement
* always call setup_container_getty_service
* include fedora 25, fingers crossed ;-)
src/PVE/LXC/Setup/Fedora.pm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/PVE/LXC/Setup/Fedora.pm b/src/PVE/LXC/Setup/Fedora.pm
index ff60b10..70aab62 100644
--- a/src/PVE/LXC/Setup/Fedora.pm
+++ b/src/PVE/LXC/Setup/Fedora.pm
@@ -16,7 +16,7 @@ sub new {
my $version;
if ($release =~ m/release\s+(\d+(?:\.\d+)?)(\.\d+)?/) {
- if ($1 >= 22 && $1 < 23) {
+ if ($1 >= 22 && $1 < 26) {
$version = $1;
}
}
@@ -30,4 +30,15 @@ sub new {
return bless $self, $class;
}
+sub template_fixup {
+ my ($self, $conf) = @_;
+ $self->setup_securetty($conf);
+ $self->ct_unlink('/etc/systemd/system/getty@.service');
+}
+
+sub setup_init {
+ my ($self, $conf) = @_;
+ $self->setup_container_getty_service($conf);
+}
+
1;
--
2.1.4
_______________________________________________
pve-devel mailing list
pve-devel@pve.proxmox.com
http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
