[Pkg-sysvinit-commits] r1325 - in sysvinit/trunk/debian: . sysv-rc/etc/init.d
kelmo-guest at alioth.debian.org
kelmo-guest at alioth.debian.org
Sat Mar 14 12:46:15 UTC 2009
Author: kelmo-guest
Date: 2009-03-14 12:46:15 +0000 (Sat, 14 Mar 2009)
New Revision: 1325
Modified:
sysvinit/trunk/debian/changelog
sysvinit/trunk/debian/control
sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
Log:
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
which was put in place to support this. Note that
debian/sysv-rc/etc/init.d/rc never actually sourced scripts ending in .sh
anyway, because they all too often called exit causing problems. Update
to Standards version 3.8.1. Closes: #339955, #519520
Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog 2009-03-14 12:30:43 UTC (rev 1324)
+++ sysvinit/trunk/debian/changelog 2009-03-14 12:46:15 UTC (rev 1325)
@@ -45,8 +45,15 @@
61ubuntu1.
* Standardize indentaion used in debian/sysv-rc/etc/init.d/rc. Use tabs
always, and not a mixture of tabs 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
+ which was put in place to support this. Note that
+ debian/sysv-rc/etc/init.d/rc never actually sourced scripts ending in .sh
+ 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:28:34 +1000
+ -- Kel Modderman <kel at otaku42.de> Sat, 14 Mar 2009 22:43:08 +1000
sysvinit (2.86.ds1-61) unstable; urgency=low
Modified: sysvinit/trunk/debian/control
===================================================================
--- sysvinit/trunk/debian/control 2009-03-14 12:30:43 UTC (rev 1324)
+++ sysvinit/trunk/debian/control 2009-03-14 12:46:15 UTC (rev 1325)
@@ -4,7 +4,7 @@
Maintainer: Debian sysvinit maintainers <pkg-sysvinit-devel at lists.alioth.debian.org>
Uploaders: Miquel van Smoorenburg <miquels at cistron.nl>, Petter Reinholdtsen <pere at debian.org>, Henrique de Moraes Holschuh <hmh at debian.org>
Build-Depends: dpatch, libselinux1-dev (>= 1.14) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libsepol1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Homepage: http://freshmeat.net/projects/sysvinit/
Vcs-Svn: svn://svn.debian.org/pkg-sysvinit/sysvinit/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-sysvinit/sysvinit/trunk/
Modified: sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
===================================================================
--- sysvinit/trunk/debian/sysv-rc/etc/init.d/rc 2009-03-14 12:30:43 UTC (rev 1324)
+++ sysvinit/trunk/debian/sysv-rc/etc/init.d/rc 2009-03-14 12:46:15 UTC (rev 1325)
@@ -95,13 +95,6 @@
$debug splash_progress "$progress" || true
}
-sh=sh
-# Debian Policy §9.3.1 requires .sh scripts in runlevel S to be
-# sourced However, some important packages currently contain .sh
-# scripts that do "exit" at some point, thus killing this process and
-# the boot. Bad! See also bug #339955.
-#[ S = "$runlevel" ] && sh=.
-
#
# Check if we are able to use make like booting. It require the
# insserv package to be enabled.
@@ -123,29 +116,11 @@
action=$1
shift
scripts="$@"
- backgrounded=0
for script in $scripts ; do
- case "$script" in
- *.sh)
- if [ "." = "$sh" ] ; then
- RC_SAVE_PATH="$PATH"
- set -- "$action"
- $debug . "$script"
- PATH="$RC_SAVE_PATH"
- startup_progress
- else
- $debug $sh "$script" $action
- startup_progress
- fi
- ;;
- *)
- $debug "$script" $action &
- startup_progress
- backgrounded=1
- ;;
- esac
+ $debug "$script" $action &
+ startup_progress
done
- [ 1 = "$backgrounded" ] && wait
+ wait
}
;;
startpar)
@@ -154,42 +129,16 @@
action=$1
shift
scripts="$@"
- # Make sure .sh scripts are sourced in runlevel S
- if [ "." = "$sh" ] ; then
- newscripts=
- for script in $scripts ; do
- case "$script" in
- *.sh)
- RC_SAVE_PATH="$PATH"
- set -- "$action"
- $debug . "$script"
- PATH="$RC_SAVE_PATH"
- startup_progress
- ;;
- *)
- newscripts="$newscripts $script"
- step=$(($step + $step_change))
- ;;
- esac
- done
- scripts="$newscripts"
- else
- # Update progress bar counter and jump to the new position
- for script in $scripts ; do
- step=$(($step + $step_change))
- done
- fi
- # startpar is not able to handle time jumps. So the
- # hwclock.sh scripts should not be executed from
- # within startpar. The .sh hack above make this
- # problem irrelevant. [pere 2005-09-10]
+ # 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
# Jump back one step to compencate for stepping one
- # time too many in the for loop, and to keep the same
- # location as the startup_progress call in the *.sh
- # case.
+ # time too many in the for loop.
step=$(($step - $step_change))
startup_progress
}
@@ -219,24 +168,8 @@
shift
scripts="$@"
for script in $scripts ; do
- case "$script" in
- *.sh)
- if [ "." = "$sh" ] ; then
- RC_SAVE_PATH="$PATH"
- set "$action"
- $debug . "$script"
- PATH="$RC_SAVE_PATH"
- startup_progress
- else
- $debug $sh "$script" $action
- startup_progress
- fi
- ;;
- *)
- $debug "$script" $action
- startup_progress
- ;;
- esac
+ $debug "$script" $action
+ startup_progress
done
}
;;
More information about the Pkg-sysvinit-commits
mailing list