From a0cfa9884e127ce856761b05a8c72262466d0c7cda4fb6b579bb89958ae8f8aa Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 24 Jul 2009 15:24:37 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/libselinux?expand=0&rev=11

---
 libselinux-bindings.spec |  4 ++--
 libselinux.changes       |  5 +++++
 libselinux.spec          | 10 +++++-----
 selinux-ready            |  6 +++---
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/libselinux-bindings.spec b/libselinux-bindings.spec
index 86cf56b..f0bdc61 100644
--- a/libselinux-bindings.spec
+++ b/libselinux-bindings.spec
@@ -23,9 +23,9 @@ BuildRequires:  libsepol-devel-static >= %{libsepol_ver}
 
 Name:           libselinux-bindings
 Version:        2.0.80
-Release:        3
+Release:        4
 Url:            http://www.nsa.gov/selinux/
-License:        GPL v2 only ;    Public Domain, Freeware
+License:        GPL v2 only ;     Public Domain, Freeware
 Group:          System/Libraries
 Summary:        SELinux library and simple utilities
 Source:         libselinux-%{version}.tar.bz2
diff --git a/libselinux.changes b/libselinux.changes
index 17a027b..4d0bf5f 100644
--- a/libselinux.changes
+++ b/libselinux.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jul 24 17:09:50 CEST 2009 - thomas@novell.com
+
+- updated selinux-ready script 
+
 -------------------------------------------------------------------
 Wed Jul 22 15:17:25 CEST 2009 - prusnak@suse.cz
 
diff --git a/libselinux.spec b/libselinux.spec
index ef1ec12..914ab8a 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -22,9 +22,9 @@ BuildRequires:  libsepol-devel >= %{libsepol_ver}
 
 Name:           libselinux
 Version:        2.0.80
-Release:        3
+Release:        4
 Url:            http://www.nsa.gov/selinux/
-License:        GPL v2 only ;    Public Domain, Freeware
+License:        GPL v2 only ;     Public Domain, Freeware
 Group:          System/Libraries
 Summary:        SELinux library and simple utilities
 Source:         %{name}-%{version}.tar.bz2
@@ -51,7 +51,7 @@ decisions.  Required for any applications that use the SELinux API.
 
 
 %package -n libselinux1
-License:        GPL v2 only ;    Public Domain, Freeware
+License:        GPL v2 only ;     Public Domain, Freeware
 Group:          System/Libraries
 Summary:        SELinux library and simple utilities
 
@@ -73,7 +73,7 @@ decisions.  Required for any applications that use the SELinux API.
 
 
 %package -n selinux-tools
-License:        GPL v2 only ;    Public Domain, Freeware
+License:        GPL v2 only ;     Public Domain, Freeware
 Group:          System/Base
 Summary:        SELinux library and simple utilities
 
@@ -95,7 +95,7 @@ decisions.  Required for any applications that use the SELinux API.
 
 
 %package devel
-License:        GPL v2 only ;    Public Domain, Freeware
+License:        GPL v2 only ;     Public Domain, Freeware
 Summary:        Development Include Files and Libraries for SELinux
 Group:          Development/Libraries/C and C++
 Requires:       libselinux1 = %{version}
diff --git a/selinux-ready b/selinux-ready
index de0fbc7..3139506 100644
--- a/selinux-ready
+++ b/selinux-ready
@@ -22,7 +22,7 @@ check_dir()
 check_filesystem()
 {
 	FSPATH="/proc/filesystems"
-	FSNAME="securityfs"
+	FSNAME="selinuxfs"
 
 	grep -w $FSNAME $FSPATH 1>&2 >/dev/null
 
@@ -37,11 +37,11 @@ check_filesystem()
 
 check_boot()
 {
-	BPARAM="selinux=1"
+	BPARAM="security=selinux.*selinux=1.*enforcing=?"  # XXX order not mandatory
 
 	printf "\tcheck_boot: Assuming GRUB as bootloader.\n"
 
-	BLINE=$(grep -- $BPARAM /boot/grub/menu.lst 2>/dev/null) # XXX check for multiple lines in config
+	BLINE=$(grep -E $BPARAM /boot/grub/menu.lst 2>/dev/null) # XXX check for multiple lines in config
 
 	if [ $? == 0 ]; then
 		K=$(echo $BLINE | awk -F' ' '{print $2}')