From 92b6262ac73c2ded011b0de1e78b4eca90584685 Mon Sep 17 00:00:00 2001
From: Chris Richards <gizmo@giz-works.com>
Date: Thu, 6 Jan 2011 18:20:53 -0600
Subject: Bug 349571 - SELinux fixes for bootmisc

- delete the contents of the $RC_LIBEXECDIR/console directory but not
  the directory itself.
  - direct error output from the chmod call for /tmp to /dev/null.
---
 init.d/bootmisc.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'init.d')

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index 3cead5e6..1298740f 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -25,7 +25,7 @@ cleanup_tmp_dir()
 		mkdir -p "$dir" || return $?
 	fi
 	dir_writeable "$dir" || return 1
-	chmod a+rwt "$dir"
+	chmod a+rwt "$dir" 2> /dev/null
 	cd "$dir"
 	if yesno $wipe_tmp; then
 		ebegin "Wiping $dir directory"
@@ -77,7 +77,7 @@ mkutmp()
 start()
 {
 	# Remove any added console dirs
-	rm -rf "$RC_LIBEXECDIR"/console
+	rm -rf "$RC_LIBEXECDIR"/console/*
 
 	local logw=false runw=false extra=
 	# Ensure that our basic dirs exist
-- 
cgit v1.2.3