Add bootoption to skip an initskript.

diff --git a/config/rootfiles/core/38/filelists/files b/config/rootfiles/core/38/filelists/files
index ab3698a1e56b8cb6918ee761e25ef8e75fdaa4f3..ed358da23f64f45aaf770d688017796d2de7e66e 100644 (file)
--- 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/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
 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 38d4ae2dfa8f722699d4883ef858d2711bde3066..94e7a08e5945896c968d2611db687ed585016bb4 100644 (file)
--- 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
 #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
        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
 
                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