From 52f7df0d0c36be3d92c67f46a0f9433b0150ccf4 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Mon, 3 Sep 2007 14:02:15 +0000
Subject: Add --quiet to mountinfo

---
 init.d/halt.sh    |  2 +-
 init.d/localmount | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'init.d')

diff --git a/init.d/halt.sh b/init.d/halt.sh
index 2a73561..ae36979 100755
--- a/init.d/halt.sh
+++ b/init.d/halt.sh
@@ -35,7 +35,7 @@ if [ "${RC_SYS}" = "VPS" ] ; then
 fi
 
 # If $svcdir is still mounted, preserve it if we can
-if mountinfo "${RC_SVCDIR}" >/dev/null && [ -w "${RC_LIBDIR}" ]  ; then
+if mountinfo -q "${RC_SVCDIR}" && [ -w "${RC_LIBDIR}" ] ; then
 	f_opts="-m -c"
 	[ "${RC_UNAME}" = "Linux" ] && f_opts="-c"
 	if [ -n "$(fuser ${f_opts} "${svcdir}" 2>/dev/null)" ] ; then
diff --git a/init.d/localmount b/init.d/localmount
index 7e20c3d..06a1979 100755
--- a/init.d/localmount
+++ b/init.d/localmount
@@ -81,7 +81,7 @@ start() {
 		fi
 
 		# Setup Kernel Support for the NFS daemon status
-		if [ -d /proc/fs/nfsd ] && ! mountinfo /proc/fs/nfsd >/dev/null ; then
+		if [ -d /proc/fs/nfsd ] && ! mountinfo -q /proc/fs/nfsd ; then
 			if grep -qs nfsd /proc/filesystems ; then
 				ebegin "Mounting nfsd filesystem"
 				mount -t nfsd -o nodev,noexec,nosuid \
@@ -91,7 +91,7 @@ start() {
 		fi
 
 		# Setup Kernel Support for miscellaneous Binary Formats
-		if [ -d /proc/sys/fs/binfmt_misc ] && ! mountinfo /proc/sys/fs/binfmt_misc >/dev/null ; then
+		if [ -d /proc/sys/fs/binfmt_misc ] && ! mountinfo -q /proc/sys/fs/binfmt_misc ; then
 			if grep -qs binfmt_misc /proc/filesystems ; then
 				ebegin "Mounting misc binary format filesystem"
 				mount -t binfmt_misc -o nodev,noexec,nosuid \
@@ -101,7 +101,7 @@ start() {
 		fi
 
 		# Setup Kernel Support for securityfs
-		if [ -d /sys/kernel/security ] && ! mountinfo /sys/kernel/security >/dev/null ; then
+		if [ -d /sys/kernel/security ] && ! mountinfo -q /sys/kernel/security ; then
 			if grep -qs securityfs /proc/filesystems ; then
 				ebegin "Mounting security filesystem"
 				mount -t securityfs securityfs /sys/kernel/security \
@@ -111,7 +111,7 @@ start() {
 		fi
 
 		# Setup Kernel Support for debugfs
-		if [ -d /sys/kernel/debug ] && ! mountinfo /sys/kernel/debug >/dev/null ; then
+		if [ -d /sys/kernel/debug ] && ! mountinfo -q /sys/kernel/debug ; then
 			if grep -qs debugfs /proc/filesystems ; then
 				ebegin "Mounting debug filesystem"
 				mount -t debugfs debugfs /sys/kernel/debug \
@@ -121,7 +121,7 @@ start() {
 		fi
 
 		# Setup Kernel Support for SELinux
-		if [ -d /selinux ] && ! mountinfo /selinux >/dev/null ; then
+		if [ -d /selinux ] && ! mountinfo -q /selinux ; then
 			if grep -qs selinuxfs /proc/filesystems ; then
 				ebegin "Mounting SELinux filesystem"
 				mount -t selinuxfs selinuxfs /selinux
-- 
cgit v1.2.3