More centos fixes (selinux + console=hvc0)

diff --git a/Osstest/CentOS.pm b/Osstest/CentOS.pm
index dd6d9d68797b186c8245301e6a41632c5654dda4..8160fe38e5a874580300e6f6239bd8ce117799c8 100644 (file)
--- 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 b82b3f9b0b3f21fd53d5dcc60d3311047130517c..067d578274ebc5bf928e63d7920b6236273f02a2 100755 (executable)
--- 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 () {