[Pkg-sysvinit-commits] r456 - sysvinit/trunk/debian/initscripts/etc/init.d

[Thomas Hood]

Author: jdthood-guest
Date: 2005-12-27 22:42:50 +0000 (Tue, 27 Dec 2005)
New Revision: 456

Modified:
   sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
   sysvinit/trunk/debian/initscripts/etc/init.d/umountfs
   sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh
Log:
Reformat (harmonize format of) code that redirects stdin

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2005-12-27 21:34:07 UTC (rev 455)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2005-12-27 22:42:50 UTC (rev 456)
@@ -52,7 +52,9 @@
 	# 	device,
 	# 3) The mount parameters for a devfs filesystem.
 	#
-exec 9>&0 </etc/fstab
+
+	exec 9>&0 </etc/fstab
+
 	fstabroot=/dev/root
 	rootdev=none
 	roottype=none
@@ -61,6 +63,7 @@
 	rootcheck=no
 	swap_on_md=no
 	devfs=
+
 	while read DEV MTPT FSTYPE OPTS DUMP PASS JUNK
 	do
 		case "$DEV" in
@@ -102,6 +105,7 @@
 			;;
 		esac
 	done
+
 	exec 0>&9 9>&-
 
 	#

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2005-12-27 21:34:07 UTC (rev 455)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2005-12-27 22:42:50 UTC (rev 456)
@@ -95,7 +95,8 @@
 	OPTS=
 	if [ -f /etc/fstab ]
 	then
-		exec 9<&0 0</etc/fstab
+		exec 9<&0 </etc/fstab
+
 		while read TAB_DEV TAB_MTPT TAB_FSTYPE TAB_OPTS TAB_REST
 		do
 			case "$TAB_DEV" in (""|\#*) continue ;; esac
@@ -112,6 +113,7 @@
 			esac
 			break
 		done
+
 		exec 0<&9 9<&-
 	fi
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountfs	2005-12-27 21:34:07 UTC (rev 455)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountfs	2005-12-27 22:42:50 UTC (rev 456)
@@ -32,6 +32,7 @@
 
 	# Umount all filesystems except root and the virtual ones
 	log_action_begin_msg "Unmounting local filesystems"
+
 	# List all mounts, deepest mount point first
 	LC_ALL=C sort -r -k 2 /proc/mounts | 
 	(
@@ -51,6 +52,7 @@
 		done
 		umount -f -r -d $DIRS
 	)
+
 	log_action_end_msg $?
 }
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh	2005-12-27 21:34:07 UTC (rev 455)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh	2005-12-27 22:42:50 UTC (rev 456)
@@ -65,7 +65,7 @@
 		then
 			umount $FLAGS $DIRS
 		fi
-	) </proc/mounts
+	) < /proc/mounts
 
 	log_action_end_msg 0
 }