[Pkg-sysvinit-commits] r1037 - in sysvinit/trunk/debian: . initscripts/etc/init.d

[Petter Reinholdtsen]

Author: pere
Date: 2006-11-26 16:15:08 +0100 (Sun, 26 Nov 2006)
New Revision: 1037

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh
Log:
  * Avoid file descriptor leak to mount in init.d/mtab.sh. (Closes: #397525).

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-11-26 14:53:36 UTC (rev 1036)
+++ sysvinit/trunk/debian/changelog	2006-11-26 15:15:08 UTC (rev 1037)
@@ -10,6 +10,7 @@
     (Closes: #388761, #393532)
   * Fix syslogging code in if-up.d/mountnfs to find logger if it exist.
     Patch from John Morrissey.  (Closes: #398644)
+  * Avoid file descriptor leak to mount in init.d/mtab.sh. (Closes: #397525).
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 25 Nov 2006 10:22:13 +0100
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh	2006-11-26 14:53:36 UTC (rev 1036)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh	2006-11-26 15:15:08 UTC (rev 1037)
@@ -44,7 +44,7 @@
 	fi
 
 	# Not mounted?
-	if ! mountpoint -q $2
+	if ! mountpoint -q $2 < /dev/null
 	then
 		return
 	fi
@@ -57,9 +57,9 @@
 	fi
 
 	# Already recorded?
-	if ! grep -E -sq "^([^ ]+) +$2 +" /etc/mtab
+	if ! grep -E -sq "^([^ ]+) +$2 +" /etc/mtab < /dev/null
 	then
-		mount -f -t $1 $OPTS $4 $NAME $2
+		mount -f -t $1 $OPTS $4 $NAME $2 < /dev/null
 	fi
 }