From 7e10f903162c9d34de407ce921d7d1ff497c6f93 Mon Sep 17 00:00:00 2001
From: Anthony PERARD <anthony.perard@citrix.com>
Date: Mon, 18 Dec 2017 18:48:18 +0000
Subject: [PATCH] More centos fixes (selinux + console=hvc0)

---
 Osstest/CentOS.pm         | 3 +++
 ts-centos-xen-pkg-install | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/Osstest/CentOS.pm b/Osstest/CentOS.pm
index dd6d9d68..8160fe38 100644
--- a/Osstest/CentOS.pm
+++ b/Osstest/CentOS.pm
@@ -89,12 +89,15 @@ umask 022
 mkdir -p .ssh
 $kickstart_wget -O .ssh/authorized_keys '$authkeys_url'
 $kickstart_wget -O .ssh/known_hosts     '$knownhosts_url'
+# Required for CentOS 6
+restorecon -Rv .ssh
 
 u=osstest
 h=/home/\$u
 mkdir -p \$h/.ssh
 cp .ssh/authorized_keys \$h/.ssh
 chown -R \$u.\$u \$h/.ssh
+restorecon -Rv \$h/.ssh
 END
 }
 
diff --git a/ts-centos-xen-pkg-install b/ts-centos-xen-pkg-install
index b82b3f9b..067d5782 100755
--- a/ts-centos-xen-pkg-install
+++ b/ts-centos-xen-pkg-install
@@ -74,6 +74,9 @@ END
     push @xen_packages, qw(libvirt-daemon-xen libvirt-client)
 	if toolstack($ho)->{Name} eq "libvirt";
     target_install_packages($ho, @xen_packages);
+
+    # On CentOS 6, to have console=hvc0:
+    target_cmd_root($ho, "grubby --update-kernel=/boot/xen.gz --args='console=hvc0'");
 }
 
 sub adjustconfig () {
-- 
2.39.5