summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2006-09-06 20:05:07 +0000
committerChris Lumens <clumens@redhat.com>2006-09-06 20:05:07 +0000
commita0f3fa05946bc70fb03d348033dbbc070e95ffb4 (patch)
tree0659b4dc24f74f181a1e6c4011f0835c92faa60f
parent3095a8aa47ebfc01ed68583ad281555a0fc1cdd1 (diff)
downloadanaconda-a0f3fa05946bc70fb03d348033dbbc070e95ffb4.tar.gz
anaconda-a0f3fa05946bc70fb03d348033dbbc070e95ffb4.tar.xz
anaconda-a0f3fa05946bc70fb03d348033dbbc070e95ffb4.zip
Pull in all policy modules.
-rw-r--r--ChangeLog2
-rwxr-xr-xscripts/upd-instroot4
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0de017741..214db540d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,6 +45,8 @@
instead of trusting yum to do that for us. This allows giving the
option of skipping incorrect repositories during kickstart (#204831).
+ * scripts/upd-instroot: Pull in all policy modules.
+
2006-09-06 Jeremy Katz <katzj@redhat.com>
* yuminstall.py (YumBackend.getBestKernelByArch): Fix change that
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index f819bcab4..47f59a6a8 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -1085,7 +1085,9 @@ fi
echo "Creating SELinux policy..."
if [ -x $DESTGR/usr/sbin/semodule ]; then
- /usr/sbin/chroot $DESTGR /usr/sbin/semodule -b /usr/share/selinux/targeted/base.pp -n -s targeted
+ ( cd $DESTGR
+ x=$(ls usr/share/selinux/targeted/*.pp | grep -v -e base.pp -e enableaudit.pp | awk '{ print "-i /" $1 }')
+ /usr/sbin/chroot $DESTGR /usr/sbin/semodule -b /usr/share/selinux/targeted/base.pp $x -n -s targeted )
fi
rm -rf $DEST/etc/selinux
mkdir $DEST/etc/selinux