This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, master has been updated via ecb061e4f93ac6ff2a0162a992e244c9a045d02b (commit) from 6814863fd1e473bfcf18d403f64f6cbdfc17cfaf (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit ecb061e4f93ac6ff2a0162a992e244c9a045d02b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jun 11 22:18:20 2010 +0200
Add bootoption to skip an initskript.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/38/filelists/files | 1 + src/initscripts/init.d/rc | 6 +++++- 2 files changed, 6 insertions(+), 1 deletions(-)
Difference in files: diff --git a/config/rootfiles/core/38/filelists/files b/config/rootfiles/core/38/filelists/files index ab3698a..ed358da 100644 --- a/config/rootfiles/core/38/filelists/files +++ b/config/rootfiles/core/38/filelists/files @@ -3,6 +3,7 @@ etc/issue etc/e2fsck.conf etc/httpd/conf/vhosts.d/ipfire-interface.conf etc/rc.d/init.d/leds +etc/rc.d/init.d/rc etc/rc.d/init.d/snort etc/rc.d/rc0.d/K79leds etc/rc.d/rc3.d/S21leds diff --git a/src/initscripts/init.d/rc b/src/initscripts/init.d/rc index 38d4ae2..94e7a08 100644 --- a/src/initscripts/init.d/rc +++ b/src/initscripts/init.d/rc @@ -71,8 +71,12 @@ fi #Start all functions in this runlevel for i in $( ls -v ${rc_base}/rc${runlevel}.d/S* 2> /dev/null) do + suffix=${i#$rc_base/rc$runlevel.d/S[0-9][0-9]} + + # Skip if initskript is disabled at bootprompt + grep "skipinit=$suffix" /proc/cmdline > /dev/null && continue + if [ "${previous}" != "N" ]; then - suffix=${i#$rc_base/rc$runlevel.d/S[0-9][0-9]} stop=$rc_base/rc$runlevel.d/K[0-9][0-9]$suffix prev_start=$rc_base/rc$previous.d/S[0-9][0-9]$suffix
hooks/post-receive -- IPFire 2.x development tree