[Pkg-sysvinit-commits] r1326 - in sysvinit/trunk/debian: . sysv-rc/etc/init.d

[kelmo-guest at alioth.debian.org]

Author: kelmo-guest
Date: 2009-03-14 12:49:44 +0000 (Sat, 14 Mar 2009)
New Revision: 1326

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
Log:
Standardise indentation level used in debian/sysv-rc/etc/init.d/rc. Use
tabs only, and not a mixture of tabs, 2 and 4 spaces.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-03-14 12:46:15 UTC (rev 1325)
+++ sysvinit/trunk/debian/changelog	2009-03-14 12:49:44 UTC (rev 1326)
@@ -43,8 +43,8 @@
   * Always mount /dev/pts when running Linux kernel, and do not make
     /dev/ptmx manually because udev does this. Merged from 2.86.ds1-
     61ubuntu1.
-  * Standardize indentaion used in debian/sysv-rc/etc/init.d/rc. Use tabs
-    always, and not a mixture of tabs and 4 spaces.
+  * Standardise indentation level used in debian/sysv-rc/etc/init.d/rc. Use
+    tabs only, and not a mixture of tabs, 2 and 4 spaces.
   * Debian policy version 3.8.1 no longer mandates that scripts with .sh
     suffix need to be sourced in runlevel S and run explicitly by sh in all
     other runlevels, therefore remove code from debian/sysv-rc/etc/init.d/rc
@@ -53,7 +53,7 @@
     anyway, because they all too often called exit causing problems. Update
     to Standards version 3.8.1. Closes: #339955, #519520
 
- -- Kel Modderman <kel at otaku42.de>  Sat, 14 Mar 2009 22:43:08 +1000
+ -- Kel Modderman <kel at otaku42.de>  Sat, 14 Mar 2009 22:49:18 +1000
 
 sysvinit (2.86.ds1-61) unstable; urgency=low
 

Modified: sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
===================================================================
--- sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2009-03-14 12:46:15 UTC (rev 1325)
+++ sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2009-03-14 12:49:44 UTC (rev 1326)
@@ -110,69 +110,69 @@
 # Start script or program.
 #
 case "$CONCURRENCY" in
-  shell)
-  	log_action_msg "Using shell-style concurrent boot in runlevel $runlevel"
-	startup() {
-		action=$1
-		shift
-		scripts="$@"
-		for script in $scripts ; do
-			$debug "$script" $action &
-			startup_progress
-		done
-		wait
-	}
-	;;
-  startpar)
-  	log_action_msg "Using startpar-style concurrent boot in runlevel $runlevel"
-	startup() {
-		action=$1
-		shift
-		scripts="$@"
+	shell)
+		log_action_msg "Using shell-style concurrent boot in runlevel $runlevel"
+		startup() {
+			action=$1
+			shift
+			scripts="$@"
+			for script in $scripts ; do
+				$debug "$script" $action &
+				startup_progress
+			done
+			wait
+		}
+		;;
+	startpar)
+		log_action_msg "Using startpar-style concurrent boot in runlevel $runlevel"
+		startup() {
+			action=$1
+			shift
+			scripts="$@"
 
-		# Update progress bar counter and jump to the new position
-		for script in $scripts ; do
-			step=$(($step + $step_change))
-		done
+			# Update progress bar counter and jump to the new position
+			for script in $scripts ; do
+				step=$(($step + $step_change))
+			done
 
-		[ -n "$scripts" ] && $debug startpar -a $action $scripts
+			[ -n "$scripts" ] && $debug startpar -a $action $scripts
 
-		# Jump back one step to compencate for stepping one
-		# time too many in the for loop.
-		step=$(($step - $step_change))
-		startup_progress
-	}
-	;;
-  makefile)
-	log_action_msg "Using makefile-style concurrent boot in runlevel $runlevel"
-	# The splash API is not handled with this CONCURRENCY mode
-	startup() {
-		eval "$(startpar -p 4 -t 20 -T 3 -M $1 -P $previous -R $runlevel)"
+			# Jump back one step to compencate for stepping one
+			# time too many in the for loop.
+			step=$(($step - $step_change))
+			startup_progress
+		}
+		;;
+	makefile)
+		log_action_msg "Using makefile-style concurrent boot in runlevel $runlevel"
+		# The splash API is not handled with this CONCURRENCY mode
+		startup() {
+			eval "$(startpar -p 4 -t 20 -T 3 -M $1 -P $previous -R $runlevel)"
 
-		if [ -n "$failed_service" ]
-		then
-			log_failure_msg "startpar: service(s) returned failure: $failed_service"
-		fi
+			if [ -n "$failed_service" ]
+			then
+				log_failure_msg "startpar: service(s) returned failure: $failed_service"
+			fi
 
-		if [ -n "$skipped_service" ]
-		then
-			log_warning_msg "startpar: service(s) skipped: $skipped_service"
-		fi
+			if [ -n "$skipped_service" ]
+			then
+				log_warning_msg "startpar: service(s) skipped: $skipped_service"
+			fi
 
-		unset failed_service skipped_service
-	}
-	;;
-  none|*)
-	startup() {
-		action=$1
-		shift
-		scripts="$@"
-		for script in $scripts ; do
-			$debug "$script" $action
-			startup_progress
-		done
-	}
-	;;
+			unset failed_service skipped_service
+		}
+		;;
+	none|*)
+		startup() {
+			action=$1
+			shift
+			scripts="$@"
+			for script in $scripts ; do
+				$debug "$script" $action
+				startup_progress
+			done
+		}
+		;;
 esac
 
 # Check if the splash screen should be stopped before the given