-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
This patch looks good to me. acked.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAk9x4BgACgkQrlYvE4MpobM5MACgpL4b1zAOeXUEaRlXrHYU9xMv
Ie4Anj6fcLr527A0AMEoVXs6yUkFiFbx
=LOaA
-----END PGP SIGNATURE-----
>From 39396b7bb2bb769f66c90d3d875eb376a6a1eb5b Mon Sep 17 00:00:00 2001
From: Laurent Bigonville <bigon@xxxxxxxxxx>
Date: Mon, 26 Mar 2012 17:33:17 +0200
Subject: [PATCH 70/73] policycoreutils -- Only run setfiles if we found
read-write filesystems to run it on
Hi,
Only run setfiles if we have a R/W filesystem
Laurent
From: Manoj Srivastava <srivasta@xxxxxxxxxx>
Date: Thu, 5 Jun 2008 22:07:22 -0500
Subject: Only run setfiles if we found read-write filesystems to run it on
Signed-off-by: Manoj Srivastava <srivasta@xxxxxxxxxx>
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
---
policycoreutils/scripts/fixfiles | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/policycoreutils/scripts/fixfiles b/policycoreutils/scripts/fixfiles
index 445353e..779a6a1 100755
--- a/policycoreutils/scripts/fixfiles
+++ b/policycoreutils/scripts/fixfiles
@@ -233,7 +233,12 @@ then
done
FC=$TEMPFCFILE
fi
-${SETFILES} -q ${FORCEFLAG} $* ${FC} ${FILESYSTEMSRW} 2>&1 | cat >> $LOGFILE
+if [ -n "${FILESYSTEMSRW}" ]; then
+ echo "Relabeling `echo ${FILESYSTEMSRW}`"
+ ${SETFILES} -q ${FORCEFLAG} $* ${FC} ${FILESYSTEMSRW} 2>&1 | cat >> $LOGFILE
+else
+ echo >&2 "fixfiles: No suitable file systems found"
+fi
rm -rf /tmp/gconfd-* /tmp/pulse-* /tmp/orbit-* $TEMPFCFILE
UNDEFINED=`get_undefined_type` || exit $?
--
1.7.9.3
