Merge "Run fixfiles restore in chroot instead of firstboot."

2013-05-17 22:39:06 +00:00 · 2013-05-17 22:39:06 +00:00 · 103bedacc7
commit 103bedacc7
parent 7abd158346 6561ed2ce8
1 changed files with 7 additions and 1 deletions
--- a/elements/fedora/finalise.d/11-selinux-fixfiles-restore
+++ b/elements/fedora/finalise.d/11-selinux-fixfiles-restore
@ -1,6 +1,12 @@
 #!/bin/bash

+set -x
+
 # Without fixing selinux file labels, sshd will run in the kernel_t domain
 # instead of the sshd_t domain, making ssh connections fail with
 # "Unable to get valid context for <user>" error message
-touch /.autorelabel
+setfiles /etc/selinux/targeted/contexts/files/file_contexts /
+FIXFILES_LOG=$(mktemp)
+fixfiles -l $FIXFILES_LOG restore
+cat $FIXFILES_LOG
+rm $FIXFILES_LOG