summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Richards <gizmo@giz-works.com>2011-01-06 18:20:53 -0600
committerWilliam Hubbs <williamh@gentoo.org>2011-01-06 18:20:53 -0600
commit92b6262ac73c2ded011b0de1e78b4eca90584685 (patch)
treeb79ff002eaa386472685c8c3a003d20c8bbf0951
parent647df8cfe70a667f011b38a058244528c4a22a40 (diff)
downloadopenrc-92b6262ac73c2ded011b0de1e78b4eca90584685.tar.gz
openrc-92b6262ac73c2ded011b0de1e78b4eca90584685.tar.bz2
openrc-92b6262ac73c2ded011b0de1e78b4eca90584685.tar.xz
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.
-rw-r--r--init.d/bootmisc.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index 3cead5e..1298740 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