policycoreutils: Revert "run_init: If open_init_pty ..."

This reverts commit d46e88abb6e1f7b0228c30c98ba4fb739e63cda3.

In d46e88ab, run_init will not use open_init_pty as Redhat did. Our
old refpolicy still does no work well with this, and make init scripts
fail to start so revert it.

This patch should be dropped while refpolicy is upreved to 2.20120725+.

Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>

2 files changed, 42 insertions, 1 deletions

diff --git a/recipes-security/selinux/policycoreutils/policycoreutils-revert-run_init-open_init_pty.patch b/recipes-security/selinux/policycoreutils/policycoreutils-revert-run_init-open_init_pty.patch
new file mode 100644
index 0000000..aedae21
--- /dev/null
+++ b/recipes-security/selinux/policycoreutils/policycoreutils-revert-run_init-open_init_pty.patch
@@ -0,0 +1,40 @@
+From 0b2d9e47c759bf2d0842f20d6af5c4e678e9c34c Mon Sep 17 00:00:00 2001
+From: Xin Ouyang <Xin.Ouyang@windriver.com>
+Date: Tue, 4 Jun 2013 17:04:44 +0800
+Subject: [PATCH] policycoreutils: Revert "run_init: If open_init_pty ..."
+
+This reverts commit d46e88abb6e1f7b0228c30c98ba4fb739e63cda3.
+
+In d46e88ab, run_init will not use open_init_pty as Redhat did. Our
+old refpolicy still does no work well with this, and make init scripts
+fail to start so revert it.
+
+This patch should be dropped while refpolicy is upreved to 2.20120725+.
+
+Upstream-Status: Inappropriate [for old refpolicy]
+
+---
+ run_init/run_init.c | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/run_init/run_init.c b/run_init/run_init.c
+index 92034be..9db766c 100644
+--- a/run_init/run_init.c
++++ b/run_init/run_init.c
+@@ -406,13 +406,6 @@ int main(int argc, char *argv[])
+                        new_context);
+                exit(-1);
+        }
+-       if (! access("/usr/sbin/open_init_pty", X_OK)) {
+-               if (execvp(argv[1], argv + 1)) {
+-                       perror("execvp");
+-                       exit(-1);
+-               }
+-               return 0;
+-       }
+        /*
+         * Do not execvp the command directly from run_init; since it would run
+         * under with a pty under sysadm_devpts_t. Instead, we call open_init_tty,
+-- 
+1.8.1.2
+
diff --git a/recipes-security/selinux/policycoreutils_2.1.13.bb b/recipes-security/selinux/policycoreutils_2.1.13.bb
index c514567..6696357 100644
--- a/recipes-security/selinux/policycoreutils_2.1.13.bb
+++ b/recipes-security/selinux/policycoreutils_2.1.13.bb
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r2"
 
 include selinux_20120924.inc
 include ${BPN}.inc
@@ -10,4 +10,5 @@ SRC_URI[sha256sum] = "34040f06f3111d9ee957576e4095841d35b9ca9141ee8d80aab036cbef
 
 SRC_URI += "\
         file://policycoreutils-revert-restorecon-update-type.patch \
+        file://policycoreutils-revert-run_init-open_init_pty.patch \
         "