- don't try to mount /selinux if selinuxfs is not supported by kernel

diff --git a/rc-scripts-selinuxfs_mount.patch b/rc-scripts-selinuxfs_mount.patch
new file mode 100644 (file)
index 0000000..0816334
--- /dev/null
+++ b/rc-scripts-selinuxfs_mount.patch
@@ -0,0 +1,14 @@
+diff -ur rc-scripts-0.4.9.orig/rc.d/rc.sysinit rc-scripts-0.4.9/rc.d/rc.sysinit
+--- rc-scripts-0.4.9.orig/rc.d/rc.sysinit      2013-11-11 10:58:44.000000000 +0000
++++ rc-scripts-0.4.9/rc.d/rc.sysinit   2014-02-03 13:11:14.805999630 +0000
+@@ -112,9 +112,7 @@
+       if ! grep -Fq selinuxfs /proc/filesystems; then
+               # no support in kernel, no chance
+               SELINUX=no
+-      fi
+-
+-      if ! is_fsmounted selinuxfs /selinux; then
++      elif ! is_fsmounted selinuxfs /selinux; then
+               mount -n -o gid=17 -t selinuxfs selinuxfs /selinux
+       fi
+ 

diff --git a/rc-scripts.spec b/rc-scripts.spec
index 1597846b90ceb5d8098c8f60bb7752544c9e6c80..c11066abdf6794723767ff0adb86671082ebb8a8 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -8,7 +8,7 @@ Summary(pl.UTF-8):      inittab i skrypty startowe z katalogu /etc/rc.d
 Summary(tr.UTF-8):     inittab ve /etc/rc.d dosyaları
 Name:          rc-scripts
 Version:       0.4.9
 Summary(tr.UTF-8):     inittab ve /etc/rc.d dosyaları
 Name:          rc-scripts
 Version:       0.4.9

-Release:       2
+Release:       3

 License:       GPL v2
 Group:         Base
 Source0:       %{name}-%{version}.tar.gz
 License:       GPL v2
 Group:         Base
 Source0:       %{name}-%{version}.tar.gz


@@ -18,6 +18,7 @@ Source2:      sys-chroots.service
 Source3:       %{name}.tmpfiles
 Patch100:      %{name}-tld.patch
 Patch101:      %{name}-no_tmpfs_root_fsck.patch
 Source3:       %{name}.tmpfiles
 Patch100:      %{name}-tld.patch
 Patch101:      %{name}-no_tmpfs_root_fsck.patch

+Patch102:      %{name}-selinuxfs_mount.patch

 URL:           http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
 BuildRequires: autoconf
 BuildRequires: automake
 URL:           http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
 BuildRequires: autoconf
 BuildRequires: automake


@@ -111,6 +112,7 @@ programcıklar içerir.
 %setup -q
 %patch100 -p1
 %patch101 -p1
 %setup -q
 %patch100 -p1
 %patch101 -p1

+%patch102 -p1

 
 # hack, currently this results in errno@@GLIBC_PRIVATE symbol in ppp-watch:
 #GLIB_LIBS="-Wl,-static `$PKG_CONFIG --libs --static glib-2.0` -Wl,-Bdynamic"
 
 # hack, currently this results in errno@@GLIBC_PRIVATE symbol in ppp-watch:
 #GLIB_LIBS="-Wl,-static `$PKG_CONFIG --libs --static glib-2.0` -Wl,-Bdynamic"