Magellan Linux

Annotation of /trunk/dracut/patches/dracut-019-convertfs-make-selinux-optional.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1823 - (hide annotations) (download)
Fri Jun 29 09:09:25 2012 UTC (11 years, 11 months ago) by niro
File size: 832 byte(s)
-reworked patches for 019
1 niro 1823 diff -Naur dracut-019/modules.d/30convertfs/convertfs.sh dracut-019-magellan/modules.d/30convertfs/convertfs.sh
2     --- dracut-019/modules.d/30convertfs/convertfs.sh 2012-06-04 14:24:25.000000000 +0200
3     +++ dracut-019-magellan/modules.d/30convertfs/convertfs.sh 2012-06-29 12:11:50.043982815 +0200
4     @@ -174,7 +174,7 @@
5     echo "Run ldconfig."
6     ldconfig -r "$ROOT"
7    
8     -. $ROOT/etc/selinux/config
9     +[ -f $ROOT/etc/selinux/config ] && . $ROOT/etc/selinux/config
10     if [ -n "$(command -v setfiles)" ] && [ "$SELINUX" != "disabled" ] && [ -f /etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts ]; then
11     echo "Fixing SELinux labels"
12     setfiles -r $ROOT -p /etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts $ROOT/sbin $ROOT/bin $ROOT/lib $ROOT/lib64 $ROOT/usr/lib $ROOT/usr/lib64 $ROOT/etc/ld.so.cache $ROOT/var/cache/ldconfig || :